Merge pull request #771 from hflynn/rebased/develop/inplace-pyramids

Adding pyramid generation data duplication warning to in-place import (rebased onto develop)
make: Convert variables to ant properties
make: Use SPHINXOPTS rather than SPHINX_OPTS
merge develop -D org: PR 772 (make: Convert variables to ant properties)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs' (exclude comment)
Updating 921cdd8..309d0cf
Merged PRs (fast-forward):
  # PR 771 hflynn 'Adding pyramid generation data duplication warning to in-place import (rebased onto develop)'

Merged PRs:
  # PR 772 rleigh-dundee 'make: Convert variables to ant properties'

Generated by OMERO-5.1-merge-push#200 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/200/)