Additional ApiGen error fixes
Capitalize D in UUID
Correct grammar for Marshaller constructor
Merge pull request #2708 from bcrowe/3.0-apigen

3.0 - Additional ApiGen error fixes