BZ-12264:ECM Wizard Improvements
Merge branch 'EBP_Flow_Improvements' into integration