minor simplification
Making the code a wee bit more self-descriptive.
[FIXED JENKINS-17779]

The fast-forwarding logic had a problem dealing with empty lines
Improved the fast-forward efficiency by keeping the file open.
javadoc error
boxing/unboxing simplifications