This set of changes reverts the merge with master (git revert c83e740e) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits).  This branch can now be used for additional fixes before eventually being used to release D-519 as normal

This reverts commit e61f485a, reversing
changes made to 00c47d07.