DERBY-6720: Port derby-6720-01-aa-installOptionaltools.diff from trunk to 10.11 branch.

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/branches/10.11@1620962 13f79535-47bb-0310-9956-ffa450edef68