Reverting some of r72166 and fixing the $wgDBport collision between Postgres and...