Added supervisor-stdout for easier log viewing
Merge branch 'master' of github.com:Hewlett-Packard-ESS/docker-base