Add travis_retry to sudo apt-get install and pip install in .travis.yml
Merge pull request #2813 from sbesson/rebased/develop/sphinx_api_improvements

Sphinx api improvements (rebased onto develop)
Merge pull request #2832 from sbesson/rebased/develop/travis_retry

Add travis_retry to sudo apt-get install and pip install in .travis.yml (rebased onto develop)
Merge remote-tracking branch 'origin/develop' into cmake

Conflicts:
	.travis.yml
Remove epydoc targets/styles from the repository
Merge pull request #2792 from mtbc/trac-11096-import-dir-uniqueness

fix #11096: ensure that new %time% directory is unique (rebased from dev_5_0)
Merge pull request #2824 from bpindelski/rebased/develop/indexer-status

Use "pid" instead of "state" for checking service. (rebased onto develop)
Merge pull request #2831 from rleigh-dundee/cpp-gtest-fixes

OmeroCpp: Add portability fixes for gtest
merge develop -D org: PR 2391 (Imagej omero (rebased onto develop))
merge develop -D org: PR 2435 (cpp: RTypesI: use static locals in place of duplicated globals)
merge develop -D org: PR 2560 (for-loop fix removes 'undefined' from reset dialog. See #12301)
merge develop -D org: PR 2747 (Bugfix: Saved by display)
merge develop -D org: PR 2795 (Use mklink under Windows (rebased onto develop))
merge develop -D org: PR 2797 (OmeroCpp: switch build system from SCons to CMake)
merge develop -D org: PR 2799 (Auto close (rebased onto develop))
merge develop -D org: PR 2805 (`fs rename` command for modifying template values (rebased onto develop))
merge develop -D org: PR 2809 (Update develop submodules)
merge develop -D org: PR 2810 (Pytest markers registration (rebased onto develop))
merge develop -D org: PR 2812 (Overhaul of Insight's Search, Part 2 (rebased onto develop))
merge develop -D org: PR 2821 (12252 script limit (rebased onto develop))