Bug #2535: put quotes around role name in the instantiate extra template
(cherry picked from commit 5edbe4df2d956e04a1739fe012d887fa1842700d)