Comment 16 for bug 1513678

Change abandoned by Swaminathan Vasudevan (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/266026
Reason: there are still some issues preventing me to push all the files upstream on this patch. I will try to sort it out and push a new one.