Use resolved augmentation schema instead of original schema.

Change-Id: Ieb6970723539478c72f22e698cf19b05482950a1
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Merge "Use resolved augmentation schema instead of original schema."