[BACKPORT: 4.1.3; 4.2.1]: restart keepalived immediately on VRRP changes
fix merge conflict
Merge pull request #53 from rackerjoe/master

Merged automatically by jenkins after successful build test