Typos
UrlGenerator: When in HTTPS, don't specify port 443
Updated for phpunit 4.0
No need for extra check.
Merge pull request #3818 from GrahamCampbell/4.1-phpunit

[4.1] PHPUnit 4.0
Merge 4.1.