Dsl merge

 This change effectively merges DSL/Presto with robotpony/Presto in that it fixes robotpony/Presto version 1.0 so that it works with rubrix. 

It should not be necessary to propagate this change to the 1.1-features branch as that branch does  away with internal delegation, which is what was broken in master when a bunch of code clean-up was done there.