bump(coreos-base/coreos-init): Include fix for btrfs resize
Merge pull request #441 from marineam/fix-btrfs

bump(coreos-base/coreos-init): Include fix for btrfs resize
fix(etcd.service): refactor to support cloudinit and easy c10n slaughtering
Merge branch 'etcd-refactor' of https://github.com/polvi/coreos-overlay into etcd-refactor

Conflicts:
	coreos-base/oem-ami/files/cloud-config.yml
updates from testing