Merge branch 'master' into 7161-support-all-service-types
authorradhika <radhika@curoverse.com>
Fri, 25 Sep 2015 12:32:46 +0000 (08:32 -0400)
committerradhika <radhika@curoverse.com>
Fri, 25 Sep 2015 12:32:46 +0000 (08:32 -0400)

Trivial merge