Merge pull request #59 from Metaswitch/rf-fixes

Reviewer Rob - Allow multiple vendors when searching for AVPs
Merge remote-tracking branch 'origin/master' into rf-fixes