converge Split APIs with Mixed and Draft
more split_draft methods
Corrected diff between 0K and 0 C
Merge pull request #4482 from edx/markhoeber/documentation/doc-666

Corrected diff between 0K and 0 C
ispublic is in active use by Stanford.
split create_item and create_child out as separate methods
Merge pull request #4488 from edx/christina/ispublic

ispublic is in active use by Stanford.
Merge pull request #4381 from edx/nimisha/split-converge-api

Nimisha/split converge api
Don't update ancestors while bulk editing.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
ignore MAC meta files on import and also remove any such files from the course
STUD-1725
Merge pull request #4025 from edx/zub/bugfix/std1725-duplicatefilesonimport

ignore MAC meta files on import and also remove any such files from the ...
Merge pull request #4493 from edx/studio/bulk-edit-dont-update-ancestors

Don't update ancestors while bulk editing.
removed the discount value bug

check error handling if the discount value is not an integer