Fix spelling and capitalization of Contact ID and External ID
Whitespace/comment cleanup
Merge pull request #3845 from colemanw/contactID

Fix spelling and capitalization of Contact ID and External ID