Merge "lib/neutron: fix metering agent startup with systemd"