merge master -Dorg -Ssuccess-only: PR 177 (Swap default min and backg…

…round thread limits)

src/main/resources/omero-server.properties

@@ -304,7 +304,7 @@ omero.sessions.max_user_time_to_live=0
 # priority level. Internal system threads may still run.
 # Note when setting this that these threads do not
 # time out.
-omero.threads.min_threads=5
+omero.threads.min_threads=10
 
 # This setting does nothing.
 # See https://github.com/ome/omero-server/issues/154
@@ -323,7 +323,7 @@ omero.threads.max_threads=50
 # import. Note that if this value is less than min_threads,
 # min_threads will limit the number of background
 # tasks which can run simultaneously.
-omero.threads.background_threads=10
+omero.threads.background_threads=5
 
 # Number of milliseconds to wait for a slot in the
 # background queue before a rejection error will be