ACTION and Capital Metro Agency to be rolled into one from 2016