Merge branch 'devel-2.2'

* devel-2.2:
  Rename the _oss cluster vars to _os

Conflicts:
	lib/objects.py (trivial, strange that this one, and only this one, conflicted)

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