Merge branch 'release-2.8.1' of https://github.com/Sunbird-Ed/SunbirdEd-portal into release-2.8.1

# Conflicts:
#	src/app/resourcebundles/data/consumption/en.properties
#	src/app/resourcebundles/json/bn.json
#	src/app/resourcebundles/json/en.json
#	src/app/resourcebundles/json/hi.json
#	src/app/resourcebundles/json/kn.json
#	src/app/resourcebundles/json/mr.json
#	src/app/resourcebundles/json/ta.json
#	src/app/resourcebundles/json/te.json
#	src/app/resourcebundles/json/ur.json