Merge "Fix unstable FixedThreadPoolConfigBeanTest"