Merge to release, fix for fix in r35591: sometimes hppa is on PA-RISC but hpux isn't (e.g. on linux)
Fixes ticket #3537