Moving KeywordStore to align with latest changes to robot framework master