Merge branch 'nicira-role'