modules.lxc: don't pass fstype or size for btrfs
Merge branch 'bp-14324' into 2014.7
Merge pull request #14330 from thatch45/2014.7

forward merge lxc fixes
Removed unused kwarg in boto_elasticache.present
Merge pull request #14342 from rallytime/fix_unused_boto_kwargs

Removed unused kwarg in boto_elasticache.present
Merge branch '2014.7' into develop