Merge pull request #3707 from ronald-cron-arm/feature/fix_return_code_1-2.7

Backport 2.7: Fix return code expression in pkparse