Github user ahgittin commented on the issue:
https://github.com/apache/brooklyn-server/pull/867
@aledsage conflicts with #866 ^ :(
#WhyBigPullReqsArentSoBadWhenCodeIsIntertwined (this is causing pain for
the reviewer as well as the author)---
