replace 127.0.0.1 by the assigned IP address in the container's /etc/hosts file.
change 127.0.0.1 -> 127.0.1.1 & remove ::1 -> hostname mapping
Merge remote-tracking branch 'upstream/master'

Conflicts:
	container.go
Container memory limit can be specified in kilobytes, megabytes or gigabytes

    -m 10  # 10 bytes
    -m 10b # 10 bytes
    -m 10k # 10240 bytes (10 * 1024)
    -m 10m # 10485760 bytes (10 * 1024 * 1024)
    -m 10g # 10737418240 bytes (10 * 1024 * 1024 * 1024)

Units are case-insensitive, and 'kb', 'mb' and 'gb' are equivalent to 'k', 'm' and 'g'.
Update documentation to reflect changes in Config and HostConfig
Fix 2585 and clean up warning in contributing.rst
setup network when reconnecting to ghost container

Re-adding the line to setup the network when reconnecting to a ghost
container.  It was inadvertently removed by commit
31638ab2ad2a5380d447780f05f7aa078c9421f5.
Fix 2585, rebase to master
Merge pull request #2615 from jpoimboe/ghost-networking-fix

setup network when reconnecting to ghost container
Merge pull request #2590 from metalivedev/2585-addphplib

Fix 2585 and clean up warning in contributing.rst
Update ubuntu packaging script, especially to stop docker group deletion
make all image ID and container ID API responses use the Long ID (Closes #2098)
Correctly express "any address" to iptables.

Iptables interprets "-d 0.0.0.0" as "-d 0.0.0.0/32", not /0. This
results in the DNAT rule never matching any traffic if not bound
to a specific host IP.

Fixes #2598
Added status column to API client table
Vagrantfile updates.

- Remove the overrides config.vm.box and config.vm.box_url and use
  the same values for all providers.
- Use the same private key path for all providers.  It is still possible
  to set a different private key path through the environment variable
  SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
  Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
  instance type of instead of hard coding the AWS instance type as
  't1.micro'.  't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
  API tools.  This allows people who already have the EC2 tools set up
  correctly to use 'vagrant up' with less environment configuration
  than before.
- Rewrite the provisioning code.  The goal is to be idempotent and to
  correctly install docker for all providers instead of just virtualbox.
  It will conditionally install the virtualbox guest additions if
  virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
Fix formatting in tests
Merge pull request #2574 from crosbymichael/api-port-changes

Update documentation to reflect changes in Config and HostConfig
Fix sysvinit upstart detection and give it a pretty message
Merge pull request #2633 from danderson/2598-fix-iptables-anydest

Correctly express "any address" to iptables.
Merge pull request #2651 from tianon/fix-sysvinit-upstart-logic

Fix sysvinit upstart detection and give it a pretty message