new fixes for orogen and rtt.

Signed-off-by: Peter Soetens <peter@thesourceworks.com>
Version 2.6.0.14: Stick to dry for Groovy.

Signed-off-by: Peter Soetens <peter@thesourceworks.com>