Merge "Revert "Use custom openolt adapter image to test changes related to moving down flow""