Merge branch 'next' into future/base-with-next

# Conflicts:
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	examples/official-storybook/stories/addon-a11y/highlight.stories.js
#	lib/api/src/lib/stories.ts
#	lib/api/src/tests/stories.test.ts
#	lib/blocks/src/controls/Text.tsx
#	lib/core-server/src/build-static.ts
#	lib/core-server/src/utils/StoryIndexGenerator.ts
#	lib/manager-webpack4/src/presets/manager-preset.ts
#	lib/telemetry/src/get-monorepo-type.ts
#	yarn.lock