Applied guava patch from kedwards
Migrated all remaining MapMaker references
Fix incorrect use of CacheLoader
Fixed remaining guava compilation issues
Updated build to use Java 1.7 language
Applied guava patch from kedwards
Migrated all remaining MapMaker references
Fix incorrect use of CacheLoader
Fixed remaining guava compilation issues
Merge branch 'dev/mspaulding/java-deps' of git.eucalyptus-systems.com:eucalyptus into dev/mspaulding/java-deps
Merge branch 'testing' into dev/mspaulding/java-deps

Conflicts:
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/vmtypes/VmTypes.java
Remove unused imports
Merge branch 'testing' into dev/mspaulding/java-deps