apache/incubator-brooklyn — pull request #353 by aledsage (2014-11-21 11:52:27+00:00)
Title: DO NOT MERGE: Fix various 20141120

This is currently for review only, and for sharing with @Nakomis
I'm happy with the first two commits; but not the "TODO Hack" commit!