Merge "Fixes persistency problem with MongoDB in AASServerComponent"