Merge "dcaegen2 jobs updates for jjb migration"