CC-5629 : Smart Block timestamps aren't saved in UTC time
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x