Fix test to be backwards compatible with Java 6
Fix TaskDeploymentDescriptor serialization