Bug542

This fixes #541 on`master`, similar to pull request 543 which fixed it on `3.3.x`.

In addition, it fixes #542, allowing the RAP webopi to be built off `master`, where it was broken because opibuilder included some new E4 code that is not supported on RAP and thus needed to be extracted into the singlesource plugin.