Merge "Revert "Implement and switch docker-test to use bin-reclass""