diff -Nru puppet-3.7.2/debian/changelog puppet-3.7.2/debian/changelog
--- puppet-3.7.2/debian/changelog	2014-10-24 08:47:25.000000000 -0300
+++ puppet-3.7.2/debian/changelog	2015-02-04 14:39:32.000000000 -0300
@@ -1,3 +1,10 @@
+puppet (3.7.2-1ubuntu1) vivid; urgency=medium
+
+  * Wait until the puppet and puppetmaster daemons are actually stopped
+    before returning (LP: #1315021) 
+
+ -- Felipe Reyes <felipe.reyes@canonical.com>  Wed, 04 Feb 2015 11:36:12 -0300
+
 puppet (3.7.2-1) unstable; urgency=medium
 
   * Imported upstream release 3.7.2
diff -Nru puppet-3.7.2/debian/puppet.init puppet-3.7.2/debian/puppet.init
--- puppet-3.7.2/debian/puppet.init	2014-10-24 08:47:25.000000000 -0300
+++ puppet-3.7.2/debian/puppet.init	2015-02-04 14:41:02.000000000 -0300
@@ -34,7 +34,7 @@
 }
 
 stop_puppet_agent() {
-	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+	start-stop-daemon --stop --retry TERM/10/KILL/5 --quiet --oknodo --pidfile $PIDFILE
 }
 
 status_puppet_agent() {
@@ -63,7 +63,6 @@
     restart|force-reload)
 	log_begin_msg "Restarting $DESC"
 	stop_puppet_agent
-	sleep 1
 	start_puppet_agent
 	log_end_msg $?
 	;;
diff -Nru puppet-3.7.2/debian/puppetmaster.init puppet-3.7.2/debian/puppetmaster.init
--- puppet-3.7.2/debian/puppetmaster.init	2014-10-24 08:47:25.000000000 -0300
+++ puppet-3.7.2/debian/puppetmaster.init	2015-02-04 14:39:59.000000000 -0300
@@ -48,7 +48,7 @@
 }
 
 stop_puppet_master() {
-    start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
+    start-stop-daemon --stop --retry TERM/10/KILL/5 --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
 }
 
 status_puppet_master() {
@@ -76,7 +76,6 @@
     restart|force-reload)
 	log_begin_msg "Restarting $DESC"
 	stop_puppet_master
-	sleep 1
 	start_puppet_master
 	log_end_msg $?
 	;;