Migrate some changes from the remote-storage branch to the master branch, mostly support for the --notes option.
Import Composite store from remote-storage branch into master.