Update
Rename
Update Maven POM files
manual merge from 5_16 branch.
Add META-INF folder
Fixing Collections.sort issue.
Fixing JUnit test.