Merged revisions r1456740 r1456762 r1456766 from tomcat/trunk:
Rephrase the context naming rules. Clarify.

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