Merge "Fix ShellCheck issues in jjb/netvirt"