Added support to use @link and @action with the same endpoint

This enables us to use @link and @action with the same endpoint name.
Test amended, all tests pass.