Merge branch 'release/1.1' into develop
jmeter tuning
Merge pull request #2 from makotan/spike/slave_tuning

jmeter tuning
set version label to 1.2
Merge branch 'release/1.2'