Rebase compose v3.1 on the latest v3
Rebase compose v3.1 on the latest v3

Signed-off-by: Daniel Nephin <6347c07ae509164cffebfb1e2a0d6ed64958db19@docker.com>

hoogenm/compose,swoopla/compose,hoogenm/compose,sdurrheimer/compose,GM-Alex/compose,schmunk42/compose,funkyfuture/docker-compose,vdemeester/compose,michael-k/docker-compose,jrabbit/compose,funkyfuture/docker-compose,dnephin/compose,sdurrheimer/compose,shin-/compose,dnephin/compose,thaJeztah/compose,swoopla/compose,michael-k/docker-compose,GM-Alex/compose,schmunk42/compose,vdemeester/compose,thaJeztah/compose,shin-/compose,jrabbit/compose