Merge pull request #1565 from sravanthi1/dev-branch

"New Parameters added to assign collection to pathways"
"Reorder Changes in classsetupview updated."