Fix the migration of AnalysisDisplay nodes
Cleanup
Merge pull request #1573 from ellensi/master

Migration fixes