One more time.

Basic idea is to clean out the root owned stuff from with the docker build container.
Merge pull request #1739 from jbeda/clean-fix

One more time.