Surround more Ice-generated includes
Also handle unused arguments
Also handle missing declarations
Also fix overloaded-virtual
Merge pull request #3108 from dominikl/min_max_channelslider_fix

Fixed bug ChannelSlider (rendering settings)
Suggestions from Roger incl. strict push/pop

The `#error` on re-entrant warning protection
showed a number of places where the includes
needed to be adjusted.
Fix tests warnings
Fix casts in combined.vm
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3037 (Group sudo)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3057 (Rating web)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3058 (Homebrew nginx (rebased onto develop))
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3069 (Scalebar)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3098 (Metadata reimport)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3109 (Disable keyboard navigation (up, down, left, right) for jquery tabs)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3115 (CLI admin diagnostics: only check readability of var folder)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3117 (Bugfix: Paste pending rendering settings)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3122 (Customise Windows service name: omero.windows.servicename)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3124 (refactoring share templates to remove duplicates)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3127 (Batch Annotate with Read-only)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3128 (OmeroCpp: Disable remaining integration search test)