Merge "Include docker support for cps-whitesource"