* Fix whitespace / empty lines in generated files * Add an 'upstream.version' variable (with fallback on 'manifest.version')