HADOOP-8216. Address log4j.properties inconsistencies btw main and template dirs. Contributed by Patrick Hunt