Thanks, that did help. There was a lag between my last update and branch. It merged much better this time with the correct revision range.
I am getting a drt error in the junit test. I hope it is not related to the merge. Have your seen this error before?

Thanks,
Bill

    [junit]
    [junit] org.labkey.api.security.PasswordExpiration$TestCase(org.labkey.test.
drt.JUnitTest$RemoteTest)
    [junit] junit.framework.AssertionFailedError: remote junit failed: org.labke
y.api.security.PasswordExpiration$TestCase
    [junit] ran: 1, errors: 0, failed: 1
    [junit] testExpirations
    [junit] junit.framework.AssertionFailedError: Invalid number of expiration
s for SixMonths expected:<33> but was:<34>
    [junit] at org.labkey.api.security.PasswordExpiration$TestCase.testExpir
ation(PasswordExpiration.java:104)
    [junit] at org.labkey.api.security.PasswordExpiration$TestCase.testExpir
ations(PasswordExpiration.java:85)