ENG-6477 Removed leading and trailing whitespace from property fields