Prototype support for CDH5 Cloudera installations - to be reworked