Merge "Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead..." into nyc-dev