Brings in latest service management library changes
Merge pull request #1949 from christav/thur-pm-update

Brings in latest service management library changes