Merge "Revert "Custom image for openolt adapter to test flow replication changes""