fixed menu issue in selfservice when running as ROOT context
Merge remote-tracking branch 'origin/master'