Added upgrade fix for cloudwatch.disable_cloudwatch_service property (had to make fieldName non-final to change it as the package class changed)  EUCA-9595
Merge branch 'dev/ethomas/EUCA-9595' into maint/4.0/testing
Merge branch 'maint/4.0/testing' of git.eucalyptus-systems.com:eucalyptus into maint/4.0/testing