Make hostnamectl patch compatible with master