Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units
authorradhika <radhika@curoverse.com>
Wed, 8 Jun 2016 14:37:14 +0000 (10:37 -0400)
committerradhika <radhika@curoverse.com>
Wed, 8 Jun 2016 14:37:14 +0000 (10:37 -0400)

Trivial merge