Fix Content Pipeline build errors on OS X
Merge pull request #1582 from kylewlacy/develop

Fix Content Pipeline build errors on OS X
Fixed default.build target for Linux
Merge remote-tracking branch 'upstream/develop' into ContentTypeReader