Comment 9 for bug 1388716

Change abandoned by Sam Yaple (<email address hidden>) on branch: master
Review: https://review.openstack.org/140601