fixes an issue where the base path in the service document incorrectly pointed to the baseuri rather than the expected company base service uri.  Added integration tests.
Merge commit '9acefc55a94a79f6027d9ffd7787e8acc5ecbd32' into aaron-dev
Use velocity template include facility to split RIM-DSL.vm
Small refactoring of tests to return InteractionModel in test harness rather than the dsl itself.
Enhance the RimDslGenerator to be able to name the resources and return a map of generated resources.
Change the generator to write the RIM artifacts using the new dsl map approach.
Remove deprecation declaration, we want the method as it creates the velocity engine for us.
Organise imports
Minor fix to the SDK that generates a filter parameter to the resource.  Prior to this change two transitions to the same resource would effectively overwrite one another's filter query.