Added a boot partition after the MBR to fix boot issues found under
BROKER-20.
Fix compilation warning and indentation.
Fixes switch statement with missing break in default for BROKER-20.
Fix issue injecting the SSH keys into the image for BROKER-20.
Fix issue where lines in device mapper setup table were truncated for
BROKER-20
Merge branch 'maint/3.2/testing' into team/clc-dev/BROKER-20-3.2
Merge branch 'maint/3.2/testing' into team/clc-dev/BROKER-20

Conflicts:
	storage/blobstore.c
	storage/vbr.c
	util/misc.c
Merge branch 'maint/3.2/testing' of git.eucalyptus-systems.com:eucalyptus into maint/3.2/testing