Merge branch '7696-pysdk-all-keep-service-types-wip'
authorBrett Smith <brett@curoverse.com>
Fri, 13 Nov 2015 14:29:40 +0000 (09:29 -0500)
committerBrett Smith <brett@curoverse.com>
Fri, 13 Nov 2015 14:29:40 +0000 (09:29 -0500)
Closes #7696, #7758.


Trivial merge