Merge pull request #1 from kanzure/service-installer-updates

Service installer updates
Merge branch 'develop' into service-installer-updates