Merge branch '3889-functional-testing-TC' into 3889-functional-testing
authorradhika <radhika@curoverse.com>
Wed, 24 Sep 2014 17:28:22 +0000 (13:28 -0400)
committerradhika <radhika@curoverse.com>
Wed, 24 Sep 2014 17:28:22 +0000 (13:28 -0400)

Trivial merge