Adding missing metastore dependency (merge from master to current sprint feature branch)