PHOENIX-1128 Fix build errors introduced by switch to hadoop2 as default profile (GabrielReid)