SMC-901: Remove the supression of the site_page body summary.
SMC-848: Prevent creating duplicate terms by cleaning up the taxonomy_sync table. Improved code via Drupal coding standards in some places.
Merge branch 'SMC-848'

Conflicts:
	profile/modules/custom/taxonomy_sync/taxonomy_sync.module
Merge branch 'SMC-901'
Merge branch 'master' of svn-2314.prod.hosting.acquia.com:sanmateo