Comment 5 for bug 1504058

Change abandoned by Flavio Percoco (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/232462
Reason: re-submitting from master