Merge "Configure timeout for fmqUnitTest"