Merge pull request serverless#6129 from serverless/fix-restapi-id

Improve handling of custom API Gateway options

Merge pull request serverless#6111 from serverless/fix-restapi-id

Fix restApiId resolution in post CF deployment phase

fix use of cors: true (serverless#6104)

fix use of cors: true

Merge pull request serverless#6097 from serverless/release-v1.42.0

Releasing v1.42.0

Releasing v1.41.1

Merge pull request serverless#6025 from serverless/releasing-v-1-41-0

Releasing v1.41.0

Merge pull request serverless#5963 from serverless/release-1.40.0

Version 1.40.0 release

Releasing v1.39.1

Merge pull request serverless#5924 from serverless/release-1-39

Releasing v1.39.0

Merge pull request serverless#5852 from serverless/releasing-v-1-38-0

Releasing v1.38.0