Merge "Tidied up the last references to ODL" into stable/arno
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Sun, 20 Sep 2015 16:46:26 +0000 (16:46 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sun, 20 Sep 2015 16:46:26 +0000 (16:46 +0000)

Trivial merge