Merge "Remove ODL restart from start script"