fixed bad merge in Dockerfile
fixed wrongly solved conflict
Merge branch '3.4'

Conflicts:
	extra/scripts/docker/Dockerfile