comment
Merge branch 'osng-486' of github.com:osiam/addon-administration into osng-486