Merge "Fix ShellCheck issues in jjb/opflex"