Removed deprecated API's for 3.0.0 release
This saves 2.5KB in the jar size (which obviously does not include the unit test code)
Merge branch 'master' into unstable_staging

Conflicts:
	build.gradle
	build.upload
	pom.xml