Merge "Moving the trustore to parent folder"