Ubuntu SM + SM Client Build changes

- Tested - working up to manifest generation
- Builds correctly on Ubuntu