Fixes for changes in brooklyn 0.4.0-SNAPSHOT
Merge pull request #1 from aledsage/fix/updates-in-brooklyn-0.4

Fixes for changes in brooklyn 0.4.0-SNAPSHOT