BUG-868: migrate InstanceIdentifer.builder() users

This moves the users to the (relatively) new convenience methods,
freeing up the static builder() method.

Change-Id: I4112cba3e6794bb38e9523b770b5ae81959d1375
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-868: migrate InstanceIdentifer.builder() users"