Merge branch '7709-sdk-cli-active_support'
authorTom Clegg <tom@curoverse.com>
Wed, 22 Mar 2017 17:33:55 +0000 (13:33 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 22 Mar 2017 17:33:55 +0000 (13:33 -0400)
refs #7709


Trivial merge