Update keywords for loading data from files

In essence:

* Rename `load_initial_data_from` to `load_data_from`
  and add a new optional argument `mode`;

* Add early recursive merging of brokers' data and
  default values into `load_data_from`;

* Thanks to early merging we no longer need to
  touch `Default` in resource files, so the old code
  which used to do that was removed. Even more,
  `Default` is no longer accessible through `${BROKERS}`.

@@ -58,7 +58,7 @@ Set Suite Variable With Default Value
 
 
   # Load brokers data
   # Load brokers data
   ${file_path}=  Get Variable Value  ${BROKERS_FILE}  brokers.yaml
   ${file_path}=  Get Variable Value  ${BROKERS_FILE}  brokers.yaml
-  ${BROKERS}=  load_initial_data_from  ${file_path}
+  ${BROKERS}=  load_data_from  ${file_path}  mode=brokers
   Log  ${BROKERS}
   Log  ${BROKERS}
   Set Suite Variable  ${BROKERS}
   Set Suite Variable  ${BROKERS}
   # List of currently used brokers
   # List of currently used brokers
@@ -66,7 +66,7 @@ Set Suite Variable With Default Value
 
 
   # Load users data
   # Load users data
   ${file_path}=  Get Variable Value  ${USERS_FILE}  users.yaml
   ${file_path}=  Get Variable Value  ${USERS_FILE}  users.yaml
-  ${USERS}=  load_initial_data_from  ${file_path}
+  ${USERS}=  load_data_from  ${file_path}
   Log  ${USERS.users}
   Log  ${USERS.users}
   Set Suite Variable  ${USERS}
   Set Suite Variable  ${USERS}
   # List of currently used users
   # List of currently used users
@@ -132,11 +132,8 @@ Get Broker Property
   ...      if that property exists, otherwise, it returns a
   ...      if that property exists, otherwise, it returns a
   ...      default value.
   ...      default value.
   Run Keyword If  '${broker_name}'=='${None}'  Fail  \${broker_name} is NoneType
   Run Keyword If  '${broker_name}'=='${None}'  Fail  \${broker_name} is NoneType
-  ${status}=  Run Keyword And Return Status  Should Contain  ${BROKERS['${broker_name}']}  ${property}
-  Return From Keyword If  ${status}  ${BROKERS['${broker_name}'].${property}}
-  # If broker doesn't have that property, fall back to default value
-  Should Contain  ${BROKERS['Default']}  ${property}
-  [return]  ${BROKERS['Default'].${property}}
+  Should Contain  ${BROKERS['${broker_name}']}  ${property}
+  Return From Keyword  ${BROKERS['${broker_name}'].${property}}
 
 
 
 
 Get Broker Property By Username
 Get Broker Property By Username
@@ -166,7 +163,7 @@ Get Broker Property By Username
 
 
 Завантажити дані про тендер
 Завантажити дані про тендер
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact.yaml
-  ${ARTIFACT}=  load_initial_data_from  ${file_path}
+  ${ARTIFACT}=  load_data_from  ${file_path}
   Run Keyword If  '${USERS.users['${tender_owner}'].broker}' == 'Quinta'
   Run Keyword If  '${USERS.users['${tender_owner}'].broker}' == 'Quinta'
   ...      Set To Dictionary  ${USERS.users['${tender_owner}']}  access_token=${ARTIFACT.access_token}
   ...      Set To Dictionary  ${USERS.users['${tender_owner}']}  access_token=${ARTIFACT.access_token}
   ${TENDER}=  Create Dictionary
   ${TENDER}=  Create Dictionary
@@ -177,9 +174,7 @@ Get Broker Property By Username
 
 
 
 
 Підготовка даних для створення тендера
 Підготовка даних для створення тендера
-  ${custom_intervals}=  Get Broker Property By Username  ${tender_owner}  intervals
-  ${default_intervals}=  Get Broker Property  Default  intervals
-  ${period_intervals}=  merge_dicts  ${default_intervals}  ${custom_intervals}
+  ${period_intervals}=  Get Broker Property By Username  ${tender_owner}  intervals
   ${tender_data}=  prepare_test_tender_data  ${period_intervals}  ${mode}
   ${tender_data}=  prepare_test_tender_data  ${period_intervals}  ${mode}
   ${TENDER}=  Create Dictionary
   ${TENDER}=  Create Dictionary
   Set Global Variable  ${TENDER}
   Set Global Variable  ${TENDER}

@@ -142,14 +142,22 @@ def munch_to_object(data, format="yaml"):
         return data.toYAML(allow_unicode=True, default_flow_style=False)
         return data.toYAML(allow_unicode=True, default_flow_style=False)
 
 
 
 
-def load_initial_data_from(file_name):
+def load_data_from(file_name, mode=None):
     if not os.path.exists(file_name):
     if not os.path.exists(file_name):
         file_name = os.path.join(os.path.dirname(__file__), 'data', file_name)
         file_name = os.path.join(os.path.dirname(__file__), 'data', file_name)
     with open(file_name) as file_obj:
     with open(file_name) as file_obj:
         if file_name.endswith(".json"):
         if file_name.endswith(".json"):
-            return Munch.fromDict(load(file_obj))
+            file_data = Munch.fromDict(load(file_obj))
         elif file_name.endswith(".yaml"):
         elif file_name.endswith(".yaml"):
-            return fromYAML(file_obj)
+            file_data = fromYAML(file_obj)
+    if mode == "brokers":
+        default = file_data.pop('Default')
+        brokers = {}
+        for k, v in file_data.iteritems():
+            brokers[k] = merge_dicts(default, v)
+        return brokers
+    else:
+        return file_data
 
 
 
 
 def prepare_test_tender_data(procedure_intervals, mode):
 def prepare_test_tender_data(procedure_intervals, mode):