Merge changes from topic 'move-default-prop-v2' into oc-dev

* changes:
  Load /prop.default in recovery mode
  Revert "Revert "Load default prop from /system/etc/prop.default""