SENTRY-143: Merge db_policy_store branch into master (Brock Noland via Shreepadma Venugopalan)