Merge "Move Ubuntu node for DCAE to 8 CPUs"