Merge branch 'devel-2.3'

Conflicts:
	doc/design-2.3.rst
  This was a minor conflict with some rewording of a phrase

	lib/client/gnt_instance.py
  Removed _FormatParameterDict function as it was moved to cli.py in
  master branch

Reviewed-by: Michael Hanselmann <hansmi@google.com>