Ported impala changes over from CDH4