CONN-661:Fix high priority bugs
CONN-661:Remove unwanted import
Merge pull request #607 from alameluchidambaram/CONN-661

Conn 661