NXBT-838: align on 3.6.0-SNAPSHOT for upcoming release aligned on 6.0