Fixing hadoop 2 job tests cluster names
Merge branch 'develop' into genie_v1api
Getting the client and integration test projects back to compiling with new model classes. Logic in client still work in progress.