Bug 1231668] Additional work on Administration theme HTML validation error