merging trunk changes with IIS-CDH-5.3.0 branch
merging 20150518_new_funding_model branch changes with IIS-CDH-5.3.0 branch in order to support new funding model in IIS-CDH-5.3.0 branch
creating IIS-CDH-5.3.0 branch
#1133 dropping useless workfing_dir creation for java nodes
#919 renaming DocumentToResearchInitiative to DocumentToConceptId and DocumentToResearchInitiatives to DocumentToConceptIds