v140: clear the bootstrap variables cache so the LDAP settings can be rebuilt
Merge branch 'dev' into test
Merge branch 'test' into prod