Riviera Beach officer reinstated after fighting with disabled veteran in 2015