[BZ1124086] Fixing failing test due to automatic keystore creation chang...

...es

Reinstates https://github.com/wildfly/wildfly-core/pull/297 with workaround from https://github.com/wildfly/wildfly/pull/6922