Merge "Resolve issues creating POMBA DMaaP topics"