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
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