UAR-606

I agree, for the most part, I moved them over as implemented in 3.1.1. I will create a constants class for associate workflow and move all of these there. Nice catch.