CFY-1308 some cleanup
CFY-1308 added persistence dockerfile template