Merge pull request #6029 from jeffreybolle/master

Update upstart script to ensure networking is up before starting docker

contrib/init/upstart/docker.conf

@@ -1,6 +1,6 @@
 description "Docker daemon"
 
-start on local-filesystems
+start on (local-filesystems and net-device-up IFACE!=lo)
 stop on runlevel [!2345]
 limit nofile 524288 1048576
 limit nproc 524288 1048576