Merge branch 'devel-2.1'

* devel-2.1:
  masterd: Log PID, UID and GID of connected client
  qa: Use qa_utils.UploadFile to upload rapi_users file
  devel/upload: add --no-debug option

Conflicts:
	lib/utils.py: Trivial

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>