Merge pull request #2546 from sebmarkbage/cleanupinternals

Move more stuff out of ReactComponent
Added warning if owner-based and parent-based contexts differ.