Merge branch...

Merge branch '14-docker-compose-yaml-configure-is-referencing-old-dockerfiles-for-building' into 'develop'

Resolve "docker-compose.yaml.configure is referencing old Dockerfiles for building"

See merge request !22