Merge "Avoid ifup run if noifupdown is turned on"