Post resolve checkin of ver 1.11 UI main branch to rel branch merge ***NO_CI***. See UI label MainToRel_1.11_140911_1113.
merging 35048 to release
merging typo that caused bad link handling
playing nice with firefox bfcache
merging R5 hotfix 2 changes, creating new version