Fix broken functional and Selenium tests

Because the default for policies is now to be 'active' some Selenium
Tests were failing.

The functional tests broke due to a minor HTML fix.

Change-Id: I6de9d0ea670daaf51988f6ca20ad72d7ed95d8c8