Merge pull request #847 from magicmemories/feature/delivery-limit-policy
Allow delivery-limit policy to be set