CONN-355: Fixed the Policy Engine issues
Merge pull request #465 from nareshcgi/CONN-355

CONN-355: Fixed the Policy Engine issues