ACCUMULO-2818 Create standard keystore for Jetty

  Ensure keystore password is the same as the password for the default key it
  holds. Remove extraneous parameter for truststore generation.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'