Resolving the conflict of wait messages between docker run and up system port.
Merge branch 'master' into docs
Replacing rst for markdown in sphinx documentation.