updated version number to 2.21

Change-Id: I6f5c3c83ee0c43d92ca8d295428efe58c216c4a7