Merge "Add support for ODL credentials that have changed"