Merge branch 'master' into x/lte-multiru

* master:
  software/ors-amarisoft: enb.jinja2.cfg: Increase SNR in handover code
  software/ors-amarisoft: enb.jinja2.cfg: Factor handover code into one place
  software/ors-amarisoft: slapos-render-config: Test handover
  software/ors-amarisoft: enb.jinja2.cfg: Unify logging
  software/ors-amarisoft: test: Preprocess enb.cfg & co on YAML loading
  software/ors-amarisoft: test: Avoid YAMLLoadWarning warning
  software/ors-amarisoft: test: Factor loading YAML config into dedicated function
  software/ors-amarisoft: Merge instance-gnb.jinja2.cfg into instance-enb.jinja2.cfg
  software/ors-amarisoft: Start to introduce ORS mode
  software/ors-amarisoft: Rename ors-id -> comp-id
  software/ors-amarisoft: enb.jinja2.cfg: Tune PUCCH 1 and PUCCH 3 for CA
  stack/erp5: version up erp5diff 0.8.1.9