Fix duplicate OPTIONS method error for paths with trailing slash#3844

abhishektang wants to merge 3 commits intoaws:developaws/serverless-application-model:developfrom

abhishektang:developabhishektang/serverless-application-model:developCopy head branch name to clipboard