PAHMA-1057: Undo changes to NuxeoClientEmbedded.java. Set default tx timeout to 24 hours in context.xml, instead of hardcoding.
Merge branch 'ucb-deploy_4.0' into cinefiles_4.0