Merge "Fixes VPP mounting into ODL" into stable/colorado