MAESTRO-3406 Add support for EIP add/remove from instances