Merge branch '6-update-obsolete-nginx-configuration-for-image-build' into 'develop'
Resolve "Update obsolete nginx configuration for image build" See merge request !3
Resolve "Update obsolete nginx configuration for image build" See merge request !3