Merge "DMaaP DR adding props files"