terasort and readdir fixes
Merge branch 'master' of https://github.com/zerovm/zerovm-samples

Conflicts:
	manifest.template