J-87 Fix moxy and xdk hudson jobs

Change-Id: I960c72f406f42c748bf6ddd2d8581a49748a9298