Merge athenaHLT migration, remove changes for release seperation