Merge "Fix nodeSlector and Affinity for robot deployment"