Merge pull request #1052 from ismetkahraman/dev

Replacing the ServiceManagement library with new client library