Do not overwrite apache configuration
Fix scripts
Merge branch 'ME-519' into develop