AMBARI-4410. Failing unit tests (aonishuk)
AMBARI-4411 Customize Services: rename Custom *-log4j.xml labels as Custom log4j.properties (or Custom *-log4j). (atkach)