Merge "Update dpm command to follow --user convention."