Comment 36 for bug 1560963

Change abandoned by Rodolfo Alonso Hernandez (<email address hidden>) on branch: master
Review: https://review.openstack.org/624488
Reason: Merged with https://review.openstack.org/#/c/624437/