* origin/stable-2.1:
  Bump version to 2.1.0~rc5
  Fix missing bridge for xen instances
  Fix flipping MC flag bug
  ganeti-watcher: ensure confd is running as well