PR https://github.com/ManageIQ/manageiq/pull/11437 PR https://github.com/ManageIQ/manageiq/pull/11665
Both PRs merged and backported to darga.
Correction, backported to euwe not darga
Verified in Version 5.8.0.10-beta1.20170411212748_e47d319