Merge "Added additional test in AafUserRoleTest.java"