Bug 14690 - [3.18.x] Patron import tool page missing extra search patron options

Bug 14690 - [3.18.x] Patron import tool page missing extra search patron options

To test, apply the patch and navigate to the Patrons home page. Expand
the hidden search fields in the search header and confirm that the
layout looks correct. Perform some searches and check that the results
are correct and that the modified search fields retain their state.

Also please be sure to check the patron import page.

Owen is listed as the author of this, because that's mostly true - I just resolved the conflict for 3.18.x (LR)