Reorder file property merging; applied patch @ https://drupal.org/node/2066275