Merge "Add ietf-inet-types@2013-07-15 and ietf-yang-types@2013-07-15. Rename older...