When unsubscribing remove extra packages before saving changes
Merge branch 'jag/unsubscribe-remove-pkgs'

Conflicts:
	main/core/ChangeLog