AMBARI-4539. Test fails on Failed tests: testPopulateServicesForStack(org.apache.ambari.server.api.util.StackExtensionHelperTest) (mahadev)
AMBARI-4540. Customize Services: Remove icon and label breaks up into multiple lines. (xiwang via yusaku)