Fix error in rmi when conflict
Merge pull request #1138 from dotcloud/1123-rmi_conflict-fix

* Runtime: Fix error in rmi when conflict