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

OOIION-1818: Increased some container messaging timeouts