Comment 21 for bug 1554970

Change abandoned by Alexey Elagin (<email address hidden>) on branch: master
Review: https://review.openstack.org/383013