brooklyncentral/brooklyn — pull request #723 by aledsage (2013-04-25 10:28:45+00:00)
Title: Fix/various 20130425 0.5

Cherry-picked from https://github.com/brooklyncentral/brooklyn/pull/718, into 0.5 branch.