Revert "Change RouterGateway resource's name"

This reverts commit c7ba3770c3c4f9b0f8b2f6647ca43f9bf9db7adf.
See commit If4f14f8dc5a7d0d3a926529309f9e70ba0cfd97c and
bug #1394998

Change-Id: I51bae145681b386fd082ce42fd74748ba731aa2a
Closes-bug: #1394998
Merge "Revert "Change RouterGateway resource's name""