revert changes to the router model

Karel van Klinkrequested to merge
feature/update-iptrunk-model into develop

vendor is moved back into the router product block

Merge request reports