Jm/poodle 1.4 stable

ping @opscode/server-team