Merge pull request #7610 from neilLasrado/assessment-validations

Validations for Assessment Plan