Fix Apache puppet3 deprecation warnings
Redmine: latest WIP fixes