Change from 2.0 branch - remove CSRF protection from search form

Plus a couple of empty commits to make future branch comparisons show the correct results.