=per #3774 Persistence activator templates
Merge pull request #2009 from akka/wip-3774-rebase-persistence-activator-templates-patriknw

=per #3774 Persistence activator templates