Merge "Fixes controller Image to be overcloud-full"