changes for classpage existing classes load issue resolved
Conflicts resolved for assignment container
Merge pull request #1776 from ssushma/dev-branch

changes for classpage blockers