fix bug and add unit test
Merge pull request #883 from edx/hotfix/cdodge/fix-tab-rename

fix edit tab bug and add unit test
Merge pull request #885 from edx/release

Release