Merge pull request #259 from ploetzma/master-next

Fix SBE image pointer in garrison_defconfig