Merge "Fix spacer-lines to work with multi-node and items" into feature/zuulv3