Merge "Fix refactoring glitch in KeyStore.java" into qt-dev