Merge "Junit for AafUserRole"