Merge "Reverting robot ports for DMaaP"