add options route for corssupport, adds 2.2.1 release notes
Merge branch '2.2.x_2.9' into 2.2.x_2.10