Added cloning of FormPropertyDefinition instances
Removing bad import
Merge from upstream