Cleaning up inconsistencies in ClientDataValidator.java
Merge pull request #999 from vishwasbabu/develop

Cleaning up inconsistencies in ClientDataValidator.java