[SD-1003] Role cannot inherit itself as its ancestor
[SD-1003] Role cannot inherit itself as its ancestor
Converted the comment to TODO in update_ingest.py
Replaced schema definition with Resource.rel() for lock_session and lock_user in content.py
Merge remote-tracking branch 'andrew/master'
[SD-945] Ingest Details:
 1. Current implementation while ingesting an article ingest_provider attribute has reference to ingest_provider collection. And copies the provider name to provider attribute. Since ingest_provider collection is being modified to have source, so rename provider to source and populate the value from ingest_provider collection.
 2. Extract ingest_provider_sequence and original_source
Merge remote-tracking branch 'upstream/master'