Merge branch 'upstream_master' into icehouse51

Conflicts:
	nailgun/static/js/wizard.json

Change-Id: I284e274eb11d892e1faf7c53bf6f932bc994a0b1