Merge "Release cps docker 1.0.1 (second attempt)" into honolulu