Upgrade to Surefire 2.16 to use surefire.forkNumber var
Resolve port conflict in TestBootstrap* tests