JarsignerTask and Keystore target squashed

To accomodate merge conflucts in master