Conflicts:
	doc/security.rst
	  trivial
	lib/cli.py
	  trivial

Signed-off-by: Balazs Lecz <leczb@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>