Merge branch 'master' into refactor_args

Conflicts:
	libcnmc/cli.py
	libcnmc/res_4603/INV.py