Merge "Tidied up the last references to ODL" into stable/arno