Merge "Put shell snippets into task.shell.cmd" into feature/zuulv3