re-enable vcap_shotdown
Merge branch '3.0' of github.com:intalio/vcap into 3.0