Merge pull request #51 from apache/revert-50-fix/brooklyn-client-build