Add OPTIONS verb support, backport #1222