fix for scroll on edit issue
cherry-picking scope changes
cherry-picks for edit fix and meteor 0.6 model fix