plugins.ustreamtv: Safer provider validation.
Merge remote-tracking branch 'upstream/develop' into develop