finished OSNG-38 osiam-server/ServiceProviderConfig
Merge branch 'master' of github.com:osiam-dev/osiam