Feature #2746: Fix role tab removal in flow wizard
Feature #2746: Fix flow roles index, remove unused index vars