Merging parent and features pom.xml changes from 3.5.0 branch to

trunk.