add bp:resource-cleanup

Change-Id: I6d6c066edda28d261ec1e9aba8e4000648a17f42
Merge "add bp:resource-cleanup"