Fix for issue #3945, and fix for PUT with request content
Merge branch 'version/bump'

back to 2.2.0dev
Repair broken test. Add new tests to prevent regression
Fix another bug in AbstractControllerTestCase - POST params ignored
Merge pull request #4366 from superdweebie/AbstractControllerTest-fix

Fix for issue #3945, and fix for PUT with request content
Merge branch 'hotfix/4366' into develop

Forward port #4366