Merge "Fixes ODL rest port for Apex"