Fix MCShower update related issues --kazu
Merge branch 'mcshower_update' of github.com:larlight/larlite into mcshower_update