Merge "Formatting cleanup of POM files"