Merge "Add spacing lines and formatting to result dicts" into feature/zuulv3