Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement

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/990.schema.unapi.sql
Simple merge

diff --cc Open-ILS/web/opac/locale/en-US/lang.dtd
Simple merge