Add attributes for role and domain info

Change-Id: I439a5f77325833e3e4e23778d453af4542fe64ef
Closes-bug: #1369654
Merge "Add attributes for role and domain info"