Merge pull request #1835 from chinmaygarde/master

Tooling updates for dealing with native services distributed in pub packages