Merge "Migrate persistence to global-jjb Maven jobs"