Merge branch 'rel_2_3_6' into rel_2_3_11

Merge branch 'rel_2_3_6' into rel_2_3_11

Conflicts:
	ChangeLog
	Open-ILS/src/perlmods/lib/OpenILS.pm
	Open-ILS/src/perlmods/lib/OpenILS/Application.pm
	Open-ILS/src/sql/Pg/002.schema.config.sql
	Open-ILS/xul/staff_client/chrome/content/main/about.html
	Open-ILS/xul/staff_client/defaults/preferences/prefs.js
	README
	build/i18n/po/cat.properties/en-GB.po
	build/i18n/po/circ.properties/en-GB.po
	build/i18n/po/circ.properties/hy-AM.po
	build/i18n/po/db.seed/cs-CZ.po
	build/i18n/po/db.seed/en-GB.po
	build/i18n/po/db.seed/hy-AM.po
	build/i18n/po/fm_IDL.dtd/en-GB.po
	build/i18n/po/fm_IDL.dtd/hy-AM.po
	build/i18n/po/ils_events.xml/en-GB.po
	build/i18n/po/ils_events.xml/hy-AM.po
	build/i18n/po/lang.dtd/en-GB.po
	build/i18n/po/lang.dtd/hy-AM.po
	build/i18n/po/offline.properties/en-GB.po
	build/i18n/po/offline.properties/hy-AM.po
	build/i18n/po/patron.properties/en-GB.po
	build/i18n/po/patron.properties/hy-AM.po
	build/i18n/po/serial.properties/en-GB.po
	build/i18n/po/serial.properties/hy-AM.po
	configure.ac