Modify the handling of defaults for -a and -h as per kkolinko's review.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1633589 13f79535-47bb-0310-9956-ffa450edef68