Fix/various 20130425 0.5

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