Comment 3 for bug 1525621

Change abandoned by Eran Gampel (<email address hidden>) on branch: master
Review: https://review.openstack.org/258298
Reason: all ready in in another patch