fixed issues and changed commenting structure
Merge branch 'OSSAP-7.x' of https://github.com/priya-sudarshanam/ossap into OSSAP-7.x