Fixed rp_(un)lock not being loaded.

Fixes #1459
FPP merge
Merge branch 'master' into workshop