[WFLY-2957] Additional wiring still to go but services re-factored to be returning standard types now and made it a bit easier to replace the file based key stores with security provider based ones.