Made env calls to the ecs more resilient by making it always execute the ecs's callbackWrapper method
Fixed ecs tests so that they also test that missing callback functions are added dynamically
undocumented run
Fixed typos in comments
Merge pull request #532 from hatched/remove-unit-1365177

Fixes issue causing units removed from the inspector to hang around in the ecs.

When we made api calls of the environment but didn't provide a callback it would skip the ecs wrapper callback causing the ecs and db to get out of sync and break the GUI.

Fixes: 
 - #1365177 Removing a unit from the inspector no longer causes the unit to persist in the ecs
 - #1364549 Unable to delete a service with no unplaced units.
Added controls to sort the machine and container tokens.
Merge pull request #526 from huwshimi/token-sorting

Token sorting

Added sorting of machine and container tokens in the machine view.
Return if disabled button is clicked.
Merge branch 'develop' into disable-commit

Merge to avoid conflicts.