hg: jigsaw/jake: fix merge problems for "make docs"

[jonathan . gibbons]

Changeset: ee7c28c82b0d
Author:    jjg
Date:      2016-02-04 13:16 -0800
URL:       http://hg.openjdk.java.net/jigsaw/jake/rev/ee7c28c82b0d

fix merge problems for "make docs"

! make/Javadoc.gmk