Merge "Include storperf in the automatic docker image build process"