merge master -Dorg -Snone

Repository: openmicroscopy/omero-server-docker
Already up-to-date.

Merged PRs:
  # PR 2 dpwrussell 'Enable public user'
  # PR 17 joshmoore 'Override omero.db.name (fix ome#16)'

Generated by DOCKER-merge#287 (https://ci.openmicroscopy.org/job/DOCKER-merge/287/)