Merge branch 'master' into x/lte-multiru

* master:
  software/gitlab: update gitlab-ce to fix npm error
  NEO: add missing software.cfg.json
  software/ors-amarisoft: ru/lopcomm: Simplify and clarify cu_config.jinja2.xml
  software/ors-amarisoft: Fix pythonwitheggs to explicitly specify in-SlapOS lxml
  component/python-2.7, component/python3: fix readline termcap library detection.
  component/readline: remove outdated readline5.
  component/mariadb: build with libedit instead of outdated readline5.
  component/libedit: add.
  software/ors-amarisoft: Start to organize Radio Unit related bits under ru/