fixes for XGS-PON job Berlin

Change-Id: Ic627d390334d51c24e605d6cf8daa27923f20fef
(cherry picked from commit dfcbc56688858d077abaac156f51d33647435768)
3 files changed