Now using the nginx docker image instead of the apache one. dotcloud/docker/issues/6374

Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com> (github: jstoja)
Avoid erasing line for non-progress messages

The JSONMessage.Display methods erases the entire line by outputting the <ESC>[2K\r sequence before displaying the message content. This is not necessary for messages other than progress indicators, and introduces unwanted characters in the /events output.

Fixes #6203.

Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com> (github: icecrime)
Merge pull request #6490 from icecrime/6203-artifacts_on_events_output

Avoid erasing line for non-progress messages
pin awscli to 1.3.9, and then complexify the sync's to make them more likely to complete

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
compared the 0.11 sitemap to the 1.0 one and these are the differences

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
fixed docker port command
Merge pull request #6500 from leeplay/userguide

fixed docker port command
Merge pull request #6468 from jstoja/6374-docs-apache-image

Docs: apache image on installation
Merge pull request #6499 from SvenDowideit/add-redirects-for-renames

compared the 0.11 sitemap to the 1.0 one and these are the differences
Merge pull request #6497 from SvenDowideit/awscli-changes

pin awscli to 1.3.9, and then complexify the sync's to make them more li...