Merge branch 'master' into extract-plugin-validation

boot.js

@@ -19,8 +19,7 @@ const { Plugin } = require('./plugin')
 const { debug } = require('./lib/debug')
 const { validatePlugin } = require('./lib/validate-plugin')
 const { isBundledOrTypescriptPlugin } = require('./lib/is-bundled-or-typescript-plugin')
-const kAvvio = Symbol('kAvvio')
-const kThenifyDoNotWrap = Symbol('kThenifyDoNotWrap')
+const { loadPlugin } = require('./lib/load-plugin')
 
 function wrap (server, opts, instance) {
   const expose = opts.expose || {}