Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Merge pull request #772 from PurnimaGS/master

Added user search index code in RoleRestV2Contoller
disabled new folder create logic in resource
Merge pull request #773 from skpcharles/master

disabled new folder create logic in resource
AssessmentQuestion
Merge pull request #774 from PurnimaGS/master

DO-6052 Changed error message in RoleRestV2Controller
implemented  kafka consumer support
Merge pull request #775 from skpcharles/master

implemented  kafka consumer support
 resolved conflicts
Fixed CORE-2106 for getting ContentGooruId and ParentGooruId
Merge remote-tracking branch 'gooru/master'
Merge pull request #776 from yamunaBQ/master

Fixed CORE-2106 for getting ContentGooruId and ParentGooruId
Assessment Question create and update using kafka
conflicting file fixed in AssessmentQuestion

Conflicts:

api/src/main/java/org/ednovo/gooru/domain/service/kafka/KafkaConsumer.java

rest-v2-app/src/main/java/org/ednovo/gooru/controllers/v2/api/CollectionRestV2Controller.java
conflict-2 in AssessmentQuestion
Merge pull request #777 from prakashraja89/master

Gooru Assessment Integration
Added Support to default settings in content
Merge remote-tracking branch 'gooru/master'
Merge pull request #778 from saravanab/master

Added support to default Settings for Content