Implement a mechanism to avoid race conditions when updating keystores

[andreeaharmonic]

There is no application-level locking mechanism to prevent the keystores being edited by multiple clients simultaneously, potentially leading to a race condition whereby the last client to save will 'win', potentially leading to user confusion.