Merge "Allow multiuser use of keystore" into jb-mr2-dev