[SD-1003] Role cannot inherit itself as its ancestor
[SD-1003] Role cannot inherit itself as its ancestor
Merge remote-tracking branch 'andrew/master'