Resolves issues so that brooklyn can now build from intellij
Reenabled one of the tests for the intellij fix
Merge pull request #671 from pveentjer/intellijcompatibility

Resolves issues so that brooklyn can now build from intellij