Merge "Change POM parent in HC distribution"