Updated VmGridStore to ask for owner as well. Cleanup (OMS-495)