MetaProxyStub added.
Merge branch 'master' into stub-passing
Stub passing first attempt.
Stub passing implemented. Added merged reference.conf as well.
Merge branch 'stub-passing'