Merge "Add target-db property for OOM xacml"