Rather than attempting to refactor all the key and cert management functionality I've elected to make changes more incrementally. This is a quicker way of resolving the keystore issues being encountered. Nothing has been cleaned up around this yet. No old functionality has been removed yet, but I will begin cleaning up now unused functionality.
Although more work could be done, it is better to make this an incremental process. These changes have been tested with a full install and post install testing.
Rather than attempting to refactor all the key and cert management functionality I've elected to make changes more incrementally. This is a quicker way of resolving the keystore issues being encountered. Nothing has been cleaned up around this yet. No old functionality has been removed yet, but I will begin cleaning up now unused functionality.