Merge "Added Junit Class for AafRole.java"