Merge branch 'osng-495' of https://github.com/osiam/addon-administration into osng-495
Merge branch 'osng-495' of https://github.com/osiam/addon-administration into osng-495