ITER Sync 3.2.x, Add files from 3.2.x that were missing in master and remove code that had been removed or renamed.
Merge pull request #179 from ControlSystemStudio/iter_sync_3.2.x_to_master

ITER Sync 3.2.x to master