Merge "BUG-694: Disable DataReader registration for BA Broker"