Ignore conflict on v2 auto role assignment (bug 1161963)

Change-Id: I10581a39325b4fcdb997ad704c3ee0de494b32e0
Merge "Ignore conflict on v2 auto role assignment (bug 1161963)" into stable/grizzly