Merge "Don't try to update timezone when grain noservices is set"