Merge "updating flex-ocp fabric config"