Plugin4 merge

Merge of ekr/OpenH264/plugin2 for Master with new 'plugin' target