Merge "Use buffered output during packages.xml write" into gingerbread