Merge branch 'v4' of github.com:juju/charmstore into ingest-bundles

Conflicts:
	lppublish/lpad.go