Fix OOIION-725

Adds a test for dict_merge.
Fixes script_util.parse_args to allow bin/pycc a.x=1 a.y=2 to succeed with len(CFG.a) == 2