fix creadtedirectory for unit1
config properties
fix merge changes
cleaned up
masterservernode cleanup
Adding in the merge conflicts for the fixing of test2
Fixing the chunkserver