Also adjusts bootstrap listener to be smarter about default properties: It's better not to use the default properties at all because the user might pass some in and we don't want to overwrite them. Before Boot 2.0 we got away with it, but since 2.0 we have to be more cautious.