LP#1699838 Scale back settings for staff-based hold placement
For now, we will add just one new setting to optionally restore the old
behavior. In the absence of a 'preferred pickup location', the staff
form will default to the staff workstation OU.
LP#1693036: Simplify template, cleanup preview data
This commit corrects a few minor problems, and also attempts to simplify
and cleanup the template. The changes include:
- Adding the missing "ident_type2" field to the template and JS
- Adding missing sample data for "county"
- Moving "postal code" closer to the standard location (at the end of
the address)
- Fixing typos, and making "Claims..." labels more consistent
- Minor cleanup of the sample data
- Removing template comments that list available variables, because
this template is simpler than most, intended to print everything
