brooklyn SNAPSHOT compatibility

don't merge, as master is fine for use with 050-M2,
but this has the fixes and improvements for post-M2,
when we're ready to work on that