Comment 11 for bug 1557290

Change abandoned by Swaminathan Vasudevan (<email address hidden>) on branch: master
Review: https://review.openstack.org/297468
Reason: The parent patch is sufficient to address all the issues, so abandoning this patch.