[AS7-6647] OSGI tests failing intermittently