Merge branch '15-update-obsolete-nginx-configuration-for-image-build' into 'develop'

Resolve "Update obsolete nginx configuration for image build"

See merge request !9