Merge "Revert "Use custom OLT debian package and OLT adapter docker container to""