Keystore and Jarsigner

With the merge conflict fixes this time.