## What changes were proposed in this pull request? Some fixes from trunk are needed for STOMP-controlled data holders. Merging with trunk is probably a good idea since it's been a few weeks.
## How was this patch tested? Letting jenkins run unit tests while I do an end-to-end deploy... [ Full content available at: https://github.com/apache/ambari/pull/2163 ] This message was relayed via gitbox.apache.org for [email protected]
