required and optional tickmark issue resolved on unit setup page.
Merge pull request #1886 from ssushma/dev-branch

required and optional tickmark issue resolved on unit setup page.