OOIION-1818: Increased some container messaging timeouts
Merge pull request #493 from mmeisinger/fix1818_timeout

OOIION-1818: Increased some container messaging timeouts