Fixing some code standard errors in libraries/cms
Merge pull request #2700 from Achal-Aggarwal/code-style

Fixing some code standard issues in libraries/cms