merge 4.2 dev, add license prop migration, bump to see if we can restart edina dev server deploy