Revert "Merge remote-tracking branch 'apache/master'"

This reverts commit 9b58f349b64371c39e3c5a419453d560b10b12fc, reversing
changes made to 1221151d37f83f887bd790c2699267638df313bb.
Revert "Merge remote-tracking branch 'apache/master'"

This reverts commit 4c9c5dba5ad269719954b5728d0522766bcb144e, reversing
changes made to 9fcd1b4f39320c451d048ce4ef97d77521a12157.
Revert "Merge remote-tracking branch 'apache/master'"

This reverts commit d4161985b80a548adacae8f531cde18b1a1ad6a2, reversing
changes made to e957983c361ad31efdb3959c6f12096e82f0a209.

Conflicts:
	sbt/sbt