refactored cdh to support brooklyn-060-SNAPSHOT and GCE