CONN-733: Fixed the build cert issue
Merge pull request #638 from nareshcgi/CONN-733

CONN-733: Fixed the build cert issue