1. nsv for package inheritance etc wasn't being set up when an admin interactively created a new package using the APM UI. Changes for 5.6 for parameter inheritance caused that nsv to be referenced in this case, while it wasn't for 5.5. This caused an error message in a couple of instances.
2. Modified the package xml generator to only output parameters defined for the package itself (rather than all, including inherited ones).