Merging limited revisions from trunk.  r1140819 - Update build documentation.  r121190 - Fix RIVER-149

git-svn-id: https://svn.apache.org/repos/asf/river/jtsk/branches/2.2@1464321 13f79535-47bb-0310-9956-ffa450edef68