--- a/components/rabbitmq/rabbitmq.p5m	Wed Jun 01 13:54:12 2016 -0700
+++ b/components/rabbitmq/rabbitmq.p5m	Thu Apr 14 14:58:30 2016 -0700
@@ -20,15 +20,10 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform path=usr/lib/rabbitmq/bin/(.*) -> set action.hash sbin/%<1>>
-<transform path=usr/lib/rabbitmq/ebin/(.*) -> set action.hash ebin/%<1>>
-<transform path=usr/lib/rabbitmq/include/(.*) -> set action.hash include/%<1>>
-<transform path=usr/lib/rabbitmq/plugins/(.*) -> set action.hash plugins/%<1>>
 <transform file path=usr/share/man/.+$ -> add mangler.bypass true >
-#
 set name=pkg.fmri \
     value=pkg:/network/amqp/rabbitmq@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A message broker implementing AMQP"
@@ -53,62 +48,39 @@
 file files/rmq-mplex path=usr/bin/rabbitmq-plugins
 link path=usr/bin/rabbitmq-server target=rabbitmq-plugins
 link path=usr/bin/rabbitmqctl target=rabbitmq-plugins
-file path=usr/lib/rabbitmq/bin/rabbitmq-defaults
-file path=usr/lib/rabbitmq/bin/rabbitmq-env
-file path=usr/lib/rabbitmq/bin/rabbitmq-plugins
-file path=usr/lib/rabbitmq/bin/rabbitmq-server
-file path=usr/lib/rabbitmq/bin/rabbitmqctl
-file path=usr/lib/rabbitmq/ebin/app_utils.beam
 file path=usr/lib/rabbitmq/ebin/background_gc.beam
-file path=usr/lib/rabbitmq/ebin/credit_flow.beam
 file path=usr/lib/rabbitmq/ebin/delegate.beam
 file path=usr/lib/rabbitmq/ebin/delegate_sup.beam
 file path=usr/lib/rabbitmq/ebin/dtree.beam
 file path=usr/lib/rabbitmq/ebin/file_handle_cache.beam
 file path=usr/lib/rabbitmq/ebin/file_handle_cache_stats.beam
 file path=usr/lib/rabbitmq/ebin/gatherer.beam
-file path=usr/lib/rabbitmq/ebin/gen_server2.beam
 file path=usr/lib/rabbitmq/ebin/gm.beam
 file path=usr/lib/rabbitmq/ebin/lqueue.beam
-file path=usr/lib/rabbitmq/ebin/mirrored_supervisor.beam
 file path=usr/lib/rabbitmq/ebin/mirrored_supervisor_sups.beam
 file path=usr/lib/rabbitmq/ebin/mnesia_sync.beam
-file path=usr/lib/rabbitmq/ebin/mochijson2.beam
 file path=usr/lib/rabbitmq/ebin/mochinum.beam
 file path=usr/lib/rabbitmq/ebin/pg2_fixed.beam
 file path=usr/lib/rabbitmq/ebin/pg_local.beam
-file path=usr/lib/rabbitmq/ebin/pmon.beam
-file path=usr/lib/rabbitmq/ebin/priority_queue.beam
 file path=usr/lib/rabbitmq/ebin/rabbit.app
 file path=usr/lib/rabbitmq/ebin/rabbit.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_access_control.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_alarm.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_amqqueue.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_amqqueue_process.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_amqqueue_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_amqqueue_sup_sup.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_app.in
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_backend_dummy.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_backend_internal.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_auth_mechanism.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_mechanism_amqplain.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_mechanism_cr_demo.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_auth_mechanism_plain.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_authn_backend.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_authz_backend.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_autoheal.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_backing_queue.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_basic.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_binary_generator.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_binary_parser.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_binding.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_channel.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_channel_interceptor.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_boot_steps.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_channel_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_channel_sup_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_cli.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_client_sup.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_command_assembler.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_connection_helper_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_connection_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_control_main.beam
@@ -120,10 +92,8 @@
 file path=usr/lib/rabbitmq/ebin/rabbit_epmd_monitor.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_error_logger.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_error_logger_file_h.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_event.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_exchange_decorator.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_exchange_parameters.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type_direct.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type_fanout.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type_headers.beam
@@ -131,10 +101,8 @@
 file path=usr/lib/rabbitmq/ebin/rabbit_exchange_type_topic.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_file.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_framing.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_framing_amqp_0_8.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_framing_amqp_0_9_1.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_guid.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_heartbeat.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_hipe.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_limiter.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_log.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_memory_monitor.beam
@@ -147,38 +115,38 @@
 file path=usr/lib/rabbitmq/ebin/rabbit_mirror_queue_mode_nodes.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_mirror_queue_slave.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_mirror_queue_sync.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_misc.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_mnesia.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_mnesia_rename.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_msg_file.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_msg_store.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_msg_store_ets_index.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_msg_store_gc.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_msg_store_index.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_net.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_networking.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_node_monitor.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_nodes.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_parameter_validation.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_password.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_password_hashing_md5.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_password_hashing_sha256.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_password_hashing_sha512.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_plugins.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_plugins_main.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_plugins_usage.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_policies.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_policy.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_policy_validator.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_prelaunch.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_prequeue.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_priority_queue.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_queue_collector.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_queue_consumers.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_queue_decorator.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_queue_index.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_reader.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_location_client_local.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_location_min_masters.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_location_random.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_location_validator.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_queue_master_location_misc.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_recovery_terms.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_registry.beam
+file path=usr/lib/rabbitmq/ebin/rabbit_resource_monitor_misc.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_restartable_sup.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_router.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_runtime_parameter.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_runtime_parameters.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_sasl_report_file_h.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_ssl.beam
@@ -192,15 +160,9 @@
 file path=usr/lib/rabbitmq/ebin/rabbit_version.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_vhost.beam
 file path=usr/lib/rabbitmq/ebin/rabbit_vm.beam
-file path=usr/lib/rabbitmq/ebin/rabbit_writer.beam
-file path=usr/lib/rabbitmq/ebin/ssl_compat.beam
 file path=usr/lib/rabbitmq/ebin/supervised_lifecycle.beam
-file path=usr/lib/rabbitmq/ebin/supervisor2.beam
-file path=usr/lib/rabbitmq/ebin/tcp_acceptor.beam
-file path=usr/lib/rabbitmq/ebin/tcp_acceptor_sup.beam
 file path=usr/lib/rabbitmq/ebin/tcp_listener.beam
 file path=usr/lib/rabbitmq/ebin/tcp_listener_sup.beam
-file path=usr/lib/rabbitmq/ebin/time_compat.beam
 file path=usr/lib/rabbitmq/ebin/truncate.beam
 file path=usr/lib/rabbitmq/ebin/vm_memory_monitor.beam
 file path=usr/lib/rabbitmq/ebin/worker_pool.beam
@@ -213,29 +175,38 @@
 file path=usr/lib/rabbitmq/include/rabbit_msg_store.hrl
 file path=usr/lib/rabbitmq/plugins/README
 file path=usr/lib/rabbitmq/plugins/amqp_client-$(COMPONENT_VERSION).ez
-file path=usr/lib/rabbitmq/plugins/cowboy-0.5.0-rmq$(COMPONENT_VERSION)-git4b93c2d.ez
-file path=usr/lib/rabbitmq/plugins/eldap-$(COMPONENT_VERSION)-gite309de4.ez
-file path=usr/lib/rabbitmq/plugins/mochiweb-2.7.0-rmq$(COMPONENT_VERSION)-git680dba8.ez
+file path=usr/lib/rabbitmq/plugins/cowboy-1.0.3.ez
+file path=usr/lib/rabbitmq/plugins/cowlib-1.0.1.ez
+file path=usr/lib/rabbitmq/plugins/mochiweb-2.13.0.ez
+file path=usr/lib/rabbitmq/plugins/rabbit_common-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_amqp1_0-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_auth_backend_ldap-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_auth_mechanism_ssl-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-$(COMPONENT_VERSION).ez
+file path=usr/lib/rabbitmq/plugins/rabbitmq_event_exchange-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_federation-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_federation_management-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_management-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_management_agent-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_management_visualiser-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_mqtt-$(COMPONENT_VERSION).ez
+file path=usr/lib/rabbitmq/plugins/rabbitmq_recent_history_exchange-1.2.1.ez
+file path=usr/lib/rabbitmq/plugins/rabbitmq_sharding-0.1.0.ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_shovel-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_shovel_management-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_stomp-$(COMPONENT_VERSION).ez
-file path=usr/lib/rabbitmq/plugins/rabbitmq_test-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_tracing-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_web_dispatch-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_web_stomp-$(COMPONENT_VERSION).ez
 file path=usr/lib/rabbitmq/plugins/rabbitmq_web_stomp_examples-$(COMPONENT_VERSION).ez
-file path=usr/lib/rabbitmq/plugins/sockjs-0.3.4-rmq$(COMPONENT_VERSION)-git3132eb9.ez
-file path=usr/lib/rabbitmq/plugins/webmachine-1.10.3-rmq$(COMPONENT_VERSION)-gite9359c7.ez
+file path=usr/lib/rabbitmq/plugins/ranch-1.2.1.ez
+file path=usr/lib/rabbitmq/plugins/sockjs-0.3.4.ez
+file path=usr/lib/rabbitmq/plugins/webmachine-1.10.3.ez
+file path=usr/lib/rabbitmq/sbin/rabbitmq-defaults
+file path=usr/lib/rabbitmq/sbin/rabbitmq-env
+file path=usr/lib/rabbitmq/sbin/rabbitmq-plugins
+file path=usr/lib/rabbitmq/sbin/rabbitmq-server
+file path=usr/lib/rabbitmq/sbin/rabbitmqctl
 file path=usr/share/man/man1/rabbitmq-plugins.1
 file path=usr/share/man/man1/rabbitmq-server.1
 file path=usr/share/man/man1/rabbitmqctl.1