Merge "dcaegen2 jjb fix - enable deploy"