Revert "Bring master up to date from next"

Reverts WebGoat/WebGoat#17