Make the build more IDEA friendly

With these changes you should be able to run the embedded smoke tests even after an IDEA rebuild.
The maven-scr-plugin was generating these methods for us.  It was generating them with the protected scope.  I just added the methods to match.