Per-notification api_key
+test and fix
Merge branch 'per-notify-api-key'
v1.8.4