Restore branch 2_1_0_RC_X back to version 2.1.0-SNAPSHOT