Merge "Fix ShellCheck issues in jjb/neutron"