Merge pull request #364 from jcaldwell/dev

BISERVER-8739 - Support overwrite flag for metadata imports.
BISERVER-8503 Separate UserRoleList and UserRoleDao web services