Cherry-picking POM modifications from folders branch; without these BuildHive cannot even check PRs.
Merge branch 'master' into folders