Merge branch 'master' into 4717-read-only-keep-services-flag
authorRadhika Chippada <radhika@curoverse.com>
Thu, 14 May 2015 15:59:34 +0000 (11:59 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Thu, 14 May 2015 15:59:34 +0000 (11:59 -0400)

Trivial merge