Issue #2266997 by helmo, cweagans: Added Do not automatically enable update module when installing a site.
Make sure that db_port is never empty and defaults to 3306.
Issue #2163979 - Check if field_info_field_map() is available to not break support for old D7 versions.
Merge remote-tracking branch 'origin/6.x-2.x' into 2.3.x-dev