BUG-868: stop using InstanceIdentifier.builder()

The static helper method has been deprecated. Use either the non-static
one, or child()/augmentation() helpers.

Change-Id: Ic69057d2db669153dde60ba1797e8139623a755c
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-868: stop using InstanceIdentifier.builder()"