gatewaytest createFileAnn uses SERVICE_OPTS. See #11928
Blitz createFileAnnFromLocalFile uses SERVICE_OPTS
Add **kwargs to Proxy.close() See #11928
Merge pull request #2024 from will-moore/close_SERVICE_OPTS_fixes_11928

Close service opts fixes 11928