KFSPTS-3692 : merged to develop - removed 'logout' button completely