Merge branch 'upstream_master' into icehouse51

Conflicts:
	nailgun/static/js/wizard.json

Change-Id: I3967661b572f04f88e7083663100c84fb5fa9648