Merge changes I8673cb95,I2f2a461b

* changes:
  Make plugins have an application context
  Add system property to not disable plugins on crash