Reverting version back to 3.5.0-M5-SNAPSHOT

This reverts commit 9ed0cf20242492a035d5270c0ad789a8b7ea7bc2.