Merge "modified to the charm store rather than git for testing only."