Add example defaults locking to CM/CDH version and support Cloudera distributed JDK 1.7
Support coexisting CDH4 and CDH5 deployments with same config, useful for integration test suites