Fix conflicts that emerge while syncing the internal repository (render) with jdk9/dev. Also updated tests or part to tests newly added to jdk9/dev according to render changes.