Port DMP monkey patch changes to st2 plugin