Remove NetworkManager conflict for EL7+
Clean up waagent.conf