Add cherry-pick from github for tripleo-image-elements to pick up the RDO specific swift default ports patch