Merge: rev769 (left hand menu in u1 branded sso)