Merge pull request #126 from AzureAD/servicing

Minor updates for servicing v2