WEFC_Toronto Oct 13 commits

I think these two can go to master:
parse port in ADODB Connect
WEFC_Toronto fixes from pull 10Oct13