merge hcoop authentication changes