Merge "dockerfile: update for OPNFV docker build"