set subscriptionId to 5 to match regression test
retrieve other upstream changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #108 from MartyBurns/master

set subscriptionId to 5 to match regression test in configuration sample