Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev