Fixes role IDs in newForm.jsp
Merge branch '2.1final' into qa