Adjusts the tool 'popup' property in addition to the page popup property.
Brings the case specific logic for popups with the web content tool to the same place.
Merge pull request #3 from ox-it/WL-2963

Fix WL-2963