Merge "Get rid of manually created IKeystoreService in gatekeeper.cpp"