Revert "Revert "added review comments for the fix for bug USERGRID-22, ICLA - Malaka Mahanama""

This reverts commit e0dfaad6576ea86a0463f434e8317b07482c053d.