Merge "add ps and other tools into docker build"