merge latest jsk_travis
Merge pull request #570 from k-okada/update_jsk_travis

merge latest jsk_travis