Backport of Fix logic on apigateway that ignores current annotations on services into release/1.1.x

Backport of Fix logic on apigateway that ignores current annotations on services into release/1.1.x #1710