Merge pull request #3708 from ronald-cron-arm/feature/fix_return_code_1-2.16

Backport 2.16: Fix return code expression in pkparse