Remove cherry-pick as /#/c/123803 has landed

This I0f207a5b190bc2df86bc58fc62abc5ac6a93d73f is already merged
into tripleo-incubator. Also whitespace nits from vim