Web ui plugin integration

Hi Alex, could you pull these changes into web-ui-plugin-support but still leave web-ui-plugin-integration open, thanks a lot.