[WFLY-1522] ConcurrentModificationException in OSGi Environment

https://issues.jboss.org/browse/WFLY-1522

#### Depends on #4589