updates to be compatible with Java 7
Updating to build on gsa-unstable.