[WFLY-490] / [WFLY-2007] Additional test case clean up for current version of Apache Directory Server used in test cases.