Merge "Try/except ODL push to DB until ODL tests are refactored"