Upgrade DevKit to 3.5.0-SNAPSHOT. Fix FunctionalTestCase