bump(app-admin/locksmith): use update.conf
bump(coreos-base/coreos-cloudinit): grab update.reboot-strategy
Merge pull request #585 from philips/bump-locksmith-to-update-conf

Bump locksmith and cloudinit