some cleanup
Merge branch 'v7-stable-cleanup' into v7-stable
move to new librelp 1.2.4 APIs

This cleans up the approach taken by librelp 1.2.3, which has shown
to be not clean.
silence compiler warnings

mostly cosmetic things
Merge branch 'v7-stable'