Please review the attached patch which addresses the following PKI ticket:

The patch has been tested successfully with the following four build scenarios:
 

...
-- Java_VERSION_STRING = '1.7.0_95'
-- Javac_VERSION_OUTPUT = 'javac 1.7.0_95'
-- Javadoc_VERSION_MINOR = '7'
...
... /bin/javadoc ... -doctitle '<h1>PKI Javadoc</h1>' -author -use -version -sourcepath ...
...


...
-- Java_VERSION_STRING = '1.7.0_95'
-- Javac_VERSION_OUTPUT = 'javac 1.8.0_71'
-- Javadoc_VERSION_MINOR = '8'
...
... /bin/javadoc ... -doctitle '<h1>PKI Javadoc</h1>' -author -use -version -Xdoclint:none -sourcepath ...
...


...
-- Java_VERSION_STRING = '1.8.0_71'
-- Javac_VERSION_OUTPUT = 'javac 1.7.0_95'
-- Javadoc_VERSION_MINOR = '7'
...
... /bin/javadoc ... -doctitle '<h1>PKI Javadoc</h1>' -author -use -version -sourcepath ...
...


...
-- Java_VERSION_STRING = '1.8.0_71'
-- Javac_VERSION_OUTPUT = 'javac 1.8.0_71'
-- Javadoc_VERSION_MINOR = '8'
...
... /bin/javadoc ... -doctitle '<h1>PKI Javadoc</h1>' -author -use -version -Xdoclint:none -sourcepath ...
...