Added documentation for enabling network hopping for laptops without
repeatedly restarting OMERO server
Improved network hopping doc slightly
Fix memory command on server upgrade page
Include LDAP OR docs from Jake Carroll
Merge pull request #927 from sbesson/memory_emergency_pr

Fix memory command on server upgrade page
Merge pull request #928 from joshmoore/ldap-OR-clause

Include LDAP OR docs from Jake Carroll
Merge pull request #926 from dpwrussell/rebased/dev_5_0/network_hopper

Documentation for network hopping for developer laptops (rebased onto dev_5_0)