[FlowBundle] Added ability to use route params in steps

Added ability to pass along route parameters in steps. I also moved the query merge to be included in both possible redirects, I'm not sure if there was a reason it wasn't included in the first one but didn't see reason why it could't be.