* origin/devel-2.1:
  Rightname confd's HMAC key
  Rename SSL_CERT_FILE to NODED_CERT_FILE
  Clarify the error message for ':' in PV names

Conflicts:
	lib/bootstrap.py: Trivial
	lib/constants.py: Trivial

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>