NOJIRA: Remove Eclipse settings files that should not have been checked in.
NOJIRA: Add some Eclipse files to .gitignore.
Merge branch 'ucb-deploy_3.2' into pahma_3.2