Merge commit '4f6401df'

* commit '4f6401df':
  configure: Merge separate parts of GnuTLS test
  configure: Simplify nvenc check (and move it to the correct spot)
  configure: Drop fallback for deprecated avserver command line options
  configure: Drop feature for randomly disabling/enabling components

This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>