  </GlobalNamingResources>

  <Service name="Catalina">

    <Connector port="<%= @http_port %>" protocol="HTTP/1.1" 
               connectionTimeout="20000" 
               redirectPort="8445" />
    <Connector port="<%= @ajp_port %>" protocol="AJP/1.3" redirectPort="8445" />

    <%= tomcat_engine %>
  
  </Service>
</Server>

  </GlobalNamingResources>

  <Service name="Catalina">

    <Connector port="<%= @http_port %>" protocol="HTTP/1.1" 
               connectionTimeout="20000" 
               redirectPort="8445" />
    <Connector port="<%= @ajp_port %>" protocol="AJP/1.3" redirectPort="8445" />

    <%= @tomcat_engine %>
  
  </Service>
</Server>

Add Puppet 4 compatability fixes
Add Puppet 4 compatability fixes
