2.2 snapshot , then we will branch it into 2.1.6 for RELEASE

minor updates for the 2.1.6 update