BasicProxy unit tests (to ~85% coverage)
Merge branch 'icscf' of github.com:Metaswitch/sprout into icscf