[WFLY-2203] Work around WFLY-2283; add a test