Updated POM and CHANGELOG in preparation for 2.x release