review fixes + added rebind test

-changes based on Sam's review on Gitter.
I prefer `Boolean.TRUE.equals(getAttribute(IS_MASTER))` to avoid risk of NPE if the attribute has not been set.