Revision 1918956

Merge the r1917864 group from trunk:

 * r1917864, r1917944
   Fix cmdline parsing bugs in --change (-c) argument
   Justification:
     Syntax error in cmdline arg should not cause assertion failure
   Votes:
     +1: hartmannathan, astieger, jamessan, rinrab