(ITS#5753) Command-line tools: Handling of -x and -D vs. -Y and -U