Merge remote-tracking branch 'upstream/rel_2_10' into rel_2_10_mergery_tpac

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
Simple merge

diff --cc Open-ILS/src/sql/Pg/002.schema.config.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/030.schema.metabib.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/version-upgrade/2.9.3-2.10.0-upgrade-db.sql
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/record/summary.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/results.tt2
Simple merge