WFLY-2867: Reduce usage of Apache DS components