Reapply some patches to 5.0 that are lost when merging into master

Test Plan: it compiles, and passes all gdb unit tests on my box.

Reviewers: kfunk

Reviewed By: kfunk

Subscribers: kdevelop-devel

Differential Revision: https://phabricator.kde.org/D2292