add patched 2.1.6-SNAPSHOT support.

M