add BASE_ADDRESS to travis localsettings
Merge branch 'master' into force
Revert "Merge pull request #3803 from dimagi/revert-3800-force"

This reverts commit 1c3e632dff82c3f1adc82aeba714b102d1d02d3f, reversing
changes made to 0db9593a9f74a2bf18873761f4bb0cd3b5b0c5c9.
Merge pull request #3807 from dimagi/force

Revert "Revert "set 'force' to 'true' for "Saved Forms" and "Incomplete Forms"""