MB-199 #Updated containers for the latest version of opifex, and removed duplicate opifex installation commands from dockerfiles based on docker-postgres.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dockerfile