Fix coverity issues.
Running make indent on codebase
EUCA-3902
Merge branch 'dev/chuck/coverity' into testing

Conflicts:
	storage/ebs_utils.c
	storage/ebs_utils.h
Fixes indentation and templates
EUCA-3902