Merge branch 'master' into 4717-read-only-keep-services-flag
authorRadhika Chippada <radhika@curoverse.com>
Tue, 19 May 2015 02:22:18 +0000 (22:22 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 19 May 2015 02:22:18 +0000 (22:22 -0400)

Trivial merge