[8.0] AS7-6639 Add synchronization to workaround ISPN-2866

Temporary workaround until https://issues.jboss.org/browse/AS7-6618