Merge "Fixing an unsorted pom change"