Resolved Conflicts
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
*Added dependency for CORS Filter
Merge pull request #452 from saravanab/master

*Added dependency for CORS Filter
Merge remote-tracking branch 'gooru/master'
Added support for skip re-index on update resource stats data
Merge pull request #454 from parthibane/master

Added support for skip re-index on update resource stats data
Merge remote-tracking branch 'gooru/master'
*Fixed DO-5085 Deleted collaborator is displayed when user revisit