Merge branch 'master' into develop

* master:
  Release: v1.9.6
Review @ Coding Standards.
Merge branch 'hotfix'
Merge branch 'hotfix' into develop
case 2539 - Fix exceptional situation when holdings are not available from backend.
Merge branch 'case-2539' into develop

* case-2539:
  case 2539 - Fix exceptional situation when holdings are not available from backend.
Merge branch 'develop' of github.com:artesis/ding_availability into develop

* 'develop' of github.com:artesis/ding_availability:
  case 2069 - Revert the blackhole field update.
  Review @ Coding Standards.
Merge remote-tracking branch 'origin/develop'
Release: v1.10
Merge branch 'master' into develop
case 3082 - Converting availability text to links pointing either to objects or collection.
case 3108 - Reserve-button on collection to choose object.
case 3082 - Correcting links so that they link either to collections or objects.
case 3108 - Fix: holdings table was not shown.
case 3108 - Display reservation button only when there are at least one reservable item in collection.
case 3111 - Minor changes to availability insertion logic.
Merge remote-tracking branch 'origin/case-3082' into easy
Merge remote-tracking branch 'origin/case-3111' into easy
Merge remote-tracking branch 'origin/case-3108' into easy
Hotfix: holdings table was hidden.