Merge changes I65c0c3c9,I61740a30

* changes:
  Cleanup: fileslist target commands
  Cleanup: ram disk -> ramdisk