Merge "Fix json output appending" into feature/zuulv3