Add Renameuser and UserMerge roles

Change-Id: Ia529d3efa046129c85c1cf3d689a73c4feac89e8