Merge "Adjust nfvbench build verification"