Kyle, I had a patch for this bug but made a typo in the commit message and did not get linked.
I am going to put it back in RC-1 hoping that it will get some reviews once the bug moves to "in progress".

Change abandoned by Kyle Mestery (<email address hidden>) on branch: master
Review: https://review.openstack.org/123413
Reason: This review is > 4 weeks without comment and currently blocked by a core reviewer with a -2. We are abandoning this for now. Feel free to reactivate the review by pressing the restore button and contacting the reviewer with the -2 on this review to ensure you address their concerns.