partial revert of 89132fb9 to maintain java 8 compatibility#5

rremer wants to merge 1 commit intoperforce:masterperforce/p4java:masterfrom

rremer:consistent-java-declarationsrremer/p4java:consistent-java-declarationsCopy head branch name to clipboard