Restore GRE tunnels rc names

Summary:
The router role needs to configure several GRE tunnels,
so an unique name is needed there.

This partially reverts aa208267aeb6.

Test Plan: Deploy on router-001, ensure this is no-op

Reviewers: dereckson

Reviewed By: dereckson

Differential Revision: https://devcentral.nasqueron.org/D3063