Update and API clean-up
This issue was created automatically from an original Mantis Issue. Further discussion may take place here.
- Expose more original Proxy API to the root ProxyManager after multi-server changes
- Bring back to life SMDataSourceProxy
- Fix minor include issue