Comment 4 for bug 1336317

Change abandoned by David Lyle (<email address hidden>) on branch: master
Review: https://review.openstack.org/130844
Reason: This review is > 4 weeks without comment, and failed Jenkins the last time it was checked. We are abandoning this for now. Feel free to reactivate the review by pressing the restore button and leaving a 'recheck' comment to get fresh test results.