Remove http.conf from symlinking here. Let core deal with that and determine HTTP settings through advanced settings
Merge branch 'develop' into release/2.11

* develop:
  Remove http.conf from symlinking here. Let core deal with that and determine HTTP settings through advanced settings