[ACS 4.4] cherry-pick

[Jayapal Reddy Uradi]

Hi Daan,

Please cherry-pick the following commits to 4.4

commit e336796cd5eae39bf7755d981426160a15bc6e9f
    CLOUDSTACK-7028: Fixed adding route for additional public nic on fail over

commit a69c1ee31d233d4a6f77d68fd70b9cfe3c85f89b
    CLOUDSTACK-7027: Removing left over static nat rule

Thanks,
Jayapal