Merge "Handle null user in deletePackageLIF" into pi-dev