Move 3.6.0-rc1 references to final