modules: Add mkSinkUndeclaredOptions.
Merge pull request #5421 from nbp/mkSink

modules: Add mkSinkUndeclaredOptions.