Upgrade elasticsearch, switch to jgit rather than wrapped command line. various cleanup