20160510 city.hubballi: Train composition revised