Fixed yangtools feature file and consolodated

Change-Id: I3eb47439ad1f2baa25977be69516334df9279a3d
Signed-off-by: Ed Warnicke <eaw@cisco.com>