correct collaboration edit plan's name
add dependent formula test case and test plan
Merge branch 'master' into 3.7