Update to latest plugin_launcher code to match master