Changes for 6.1.  NOTE: version numbers will need to be updated before r...

These are changes needed for the 6.1 release.  (NOTE: versions in the pom will need to be updated to final release version.)