closes #7710
authorradhika <radhika@curoverse.com>
Wed, 2 Dec 2015 17:22:00 +0000 (12:22 -0500)
committerradhika <radhika@curoverse.com>
Wed, 2 Dec 2015 17:22:00 +0000 (12:22 -0500)
Merge branch '7710-keepclient-all-service-types'


Trivial merge