Update test code so it compiled on Java6
Remove dependency on cli-simple

Conflicts:
	tests/pom.xml
Remove dependency on cli-simple.

Conflicts:
	tests/src/test/java/com/magnet/tools/tests/SimpleJavaClientSteps.java