Merge "Fix formula for newer contrail with systemd"