RiverMouth.flush() suggest alternative,  RiverMouth.startup() refactored, and minor code cleanups

Don't know why the two RiverJobTests are randomly failing. I am (currently) on Win 2008 R2, 64bit Java Oracle 1.7U55, derby default profile