Merge "fixes for XGS-PON job Berlin" into voltha-2.8