Merge "Replace extraconfig/tasks/noop.yaml w/ Heat::None"