Merge branch 'stable-2.6'

* stable-2.6:
  Fix cfgupgrade unittests
  Upgrade wrong iv_names at cfgupgrade time
  query2: Add <, >, <=, >= comparison operators
  Fix creation of plain instances with --no-wait-for-sync
  Fixed typos, formatting, etc and added a comment
  Fix daemon-util with non-root user models

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>