Role tests across templates, DRRPP inclusion
Merge pull request #571 from somayjain/upstream2

Role tests across templates, DRRPP inclusion