Merge "Fix Rake tests for newer Ruby"

deployment_scripts/puppet/modules/lma_collector/Rakefile

@@ -44,6 +44,7 @@ task :lua_tests => [:lua_libraries, :lib_cbuf] do |t|
     LUA_TESTS.each do |f|
         sh "lua5.1", f
     end
+    Rake::Task[:remove_cbuf_library].invoke
 end
 
 # Need to pull date_time.lua from the lua_sandbox repository because some tests
@@ -122,7 +123,3 @@ task :remove_cbuf_library do |t|
         sh 'rm -f ./circular_buffer.so'
     end
 end
-
-Kernel.trap("EXIT") do
-      Rake::Task[:remove_cbuf_library].invoke
-end