Adds manage scan agent permission
Adds manage system settings permission
Merge branch '2.1final' into qa