Merge "Maven cleanup and features-parent migration"