Implemented FELIX-4032 UPnP Plugin small refactoring https://issues.apache.org/jira/browse/FELIX-4032