Merging in Upgrade to Hydra 7.2.2 and various ui bugfixes, branding upgrade.

Deploy and test throughly in master.
Trailing whitespace detected.