SWITCHYARD-1526 - Fixes issues with policy editing as well as an issue
found with the security configuration functionality on the domain page