processed pull request comments
Merge branch 'osng-481' of github.com:osiam/server into osng-481