updating maven plugins to keep up with the build
fixed test failure
Merge branch 'master' into maven-plugin-updates

Conflicts:
	pom.xml
Merge pull request #746 from Unicon/maven-plugin-updates

Updating maven plugins