Master chef 11.4

Planning to merge changes for ERT/GodTools from 11.4 into 11.10.  
In 11.4 I rebased out changes I made to the haproxy recipes for wildfly servers and also Cesar's renaming of the folder haproxy -> oldhaproxy.  This seemed safe to me since we're not currently using HAProxy for Java, and there are now no changes b/w 11.4 & 11.10 for HAProxy.