Merge "Make dpm command output more test friendly" into lmp-dev