Merge pull request #1886 from ssushma/dev-branch

required and optional tickmark issue resolved on unit setup page.
Removed Commented line.
Merge pull request #1887 from anilgooru/dev-branch

Removed Commented line.
library refresh issue resolved