Merge branch 'reuse_remote_naming_contexts' into 'ibm-trunk'

Reuse remote naming contexts

See merge request !56