*8315* prevent stage id clobbering
*8315* fix variable names, remove extra template assignment
Merge pull request #103 from jnugent/omp-stable-1_1

*8315* prevent stage id clobbering