Merge pull request #1072 from anilgooru/dev-branch

Resolved conflits in message properties.
Sravanthi Changes for Add folders in search updated
Merge pull request #1073 from ssushma/dev-branch

Sravanthi Changes for Add folders in search updated