Sync up to BeanStalk default.xml

Change-Id: I6c649b936a2342e31935fefb12a4989c0c457a02