minor changes to the test case and fix test failures - AIRAVATA-1057
fixing
fixnig a merge
fixing timestamp issue while saving data - AIRAVATA-1062
Fixing more issues with slurm monitoring - AIRAVATA-1057
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata