Add Java puppet module plus a few minor changes to main api server