HR-340 fix and additional fixes
Merge pull request #550 from monishdeb/HR-340

HR-340 fix and additional fixes
HR-330: add filter to xml
Merge pull request #552 from yashodha/HR-330

HR-330: add filter to xml
HR-341 Update cj references
HR-341 Modification to add closure and newline