Fix: VpcRouter has always PublicIp setup as it did before refactoring
Merge branch 'visitor-rebase' of github.com:schubergphilis/CloudStack into visitor-rebase