Merge commit '54d632468c0cd53087d17420d9d383bc29553d36' * commit '54d632468c0cd53087d17420d9d383bc29553d36': First version of the keystore service.
Merge commit '54d632468c0cd53087d17420d9d383bc29553d36' * commit '54d632468c0cd53087d17420d9d383bc29553d36': First version of the keystore service.