Fixing merge for sylvia's branch bpd-615

Fixing merge for sylvia's branch bpd-615
Merge pull request #2099 from edx/markhoeber/documentation/fix-sylvia-615

Fixing merge for sylvia's branch bld-615