Don't attempt to setup ACLs when information is not yet available from a relationship
Merge from trunk
Don't force a database restart whenever persistent storage configuration is changed
[stub,r=mthaddon] Don't force a reload whenever persistent storage configuration is changed, per Bug #1175546, and don't attempt to setup ACLs when information is not yet available from a relationship