Added fixes for resource update using role=

- Provide error when invalid role is chosen
- Slightly simplify new role check
- Add tests for new update syntax
Increase page timeout to 30s