Allow experiment type to be set
Merge pull request #6416 from wmtan/AllowExperimentTypeToBeSet7_3_X

Allow ExperimentType to be set in 7_3_X