Fix e5ad44c2743813a48712dede87ac121de8854e4d merge.
Merge branch 'cliff'
Restore computer consumption report functionnality.
--token support for 'slapos node register'