fixing includes in unit tests
updating for new metapackage specification
passing unit tests
Merge branch 'groovy-devel' of github.com:ros/geometry-experimental into groovy-devel