merged in fixed xacro python code from hydro-devel

includes fixes for subsitution args.
merged in updated tests from hydro-devel