[JBWS-3707] Prevent concurrency issue while waiting for jbws-spi/common fix