s3-waf: add in a little hack to deal with the ECHO rpc module for non-developer builds.