Merge "Adding ability to cleanup database stale resources" into release/2019.2.0