Bug 12565: Acq: Fix broken link in breadcrumbs

The link back to the basket when creating an order by
searching for an existing record in the catalog is
broken.

To test:
- Start a new basket
- Create a new order line by searching for an existing
  record in your catalog
- Try the link back to the basket from the breadcrumbs
  at the result list page
- Verify that the link is broken
- Apply patch and retest

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e04b3ef0685f2bbe8a25b65181c937b8eb5e34d3)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 13436: Adding more options to UsageStatsLibraryType syspref

Added options:
- research
- private
- society or association
- corporate
- government
- religious organization
- subscription
- school

Also changed 'university' to 'academic'

To test:
1) Go on to Global System Preferences and find UsageStatsLibraryType under Administration
2) Click drop-down menu and see all new options described above, as well as 'academic' instead of 'university'

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: replace tab with spaces

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 30e40bd8847d3b015477bae50f6a40358d9f70ca)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 13436: (RM followup) university -> academic DB update

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 281b3225fcbafbb26568f57c2547c4fe13bde017)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Conflicts:
	installer/data/mysql/updatedatabase.pl
Bug 13436: DBRev 3.18.02.001

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Note: it also fixes a minor POD error.
(cherry picked from commit cbf784bb9d8c01d1c05cae00d046d3799a1d7ed9)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 10753: Any library is represented by an empty string

And not with "__ANY__"

Test plan:
0/ Don't apply this patch
1/ Create a suggestion for "any library"
2/ Verify suggestions.branchcode contain "__ANY__"
3/ Apply this patch and execute the updatedb entry
4/ Create a suggestion for "any library"
5/ Verify suggestions.branchcode contain "" (for both suggestions).

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 67c3217238d6193d953914e9f2eaf816683306d7)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Database version 3.18.02.002