Merge fix for TRQ-2234: -j oe producing error at submission time with msub when using FLAGS=FSIREMOTE. Also, changed version to 4.2.5.h1.