[live] Updates puma to v2.7.1
Merge branch 'base' into live

Conflicts:
	Gemfile.lock