CONN-1191: Fixed unresolved merge conflicts
CONN-1191: Deleted erroneously added temp file
Merge pull request #834 from christophermay07/CONN-1191

CONN-1191