ccs fixes
Merge pull request #282 from aptara/Sushil

Phase2 sprint1