Fixes issue introduced when 3.2.1 release branch was merged back into develop. Namely all 3.3.0 version numbers on the .net side reverted to 3.2.1.  Some similar issues also occured on the java side and are also fixed herein.

Exception.  Updating the GTS service version to 3.3.0-SNAPSHOT break its build severly because it uses ${project.version} as its AMP version.  Thus we still need to update the GTS to use the 3.3.0-SNAPSHOT versions of AMP and CMF.  But that will take some work.