[WFLY-1759] WS management improvements / consolidation