Sprint 3 4.0.0 ga

Changes to merge from Branch PRD-4304_Multiple_Editors_Per_DataFactory