Bastion: replace 'ui-compat' as we don't use compatability mode.
Merge pull request #3150 from waldenraines/devel

Bastion: replace 'ui-compat' as we don't use compatability mode.