"resource format changes updated for add resource,edit resource, add file and edit file popups"
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/item/EditResourcePopupVc.java
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/item/EditResourcePopupVc.ui.xml
"Set Advanced options null check handled"
Merge pull request #2349 from sravanthi1/release-6.6.3.a1

"Resource format changes updated for add resource,edit resource, add file and edit file popups"