Merge "Fixed JAVA keystore file name"