Bug 862015 - Improved commandline handling for dm client;r=mcote