rolled back to last version that used rosbuild
merged in fixed xacro python code from hydro-devel

includes fixes for subsitution args.
merged in updated tests from hydro-devel
Merge branch 'groovy-devel' of https://github.com/ros/xacro into groovy-devel