MDL-17081 allow role reset to self

The use case is importing of incomplete XML preset - keep current + preset changes. This also discards any pending changes.