Fixes #3200: allows Android inventory to have their memory, video, network and drive listed
Merge pull request #9 from fanf/bug_3200/dev/process_android_inventory_mem_network_drive_video

Fixes #3200: allows Android inventory to have their memory, video, network and drive listed
Fixes #3203: assign negative slotnumber to inventory memory component missing information
Merge pull request #10 from fanf/bug_3203/dev/invalid_memory_slots_in_inventory_should_be_attributed_negative_value

Fixes #3203: assign negative slotnumber to inventory memory component missing information
Fixes #3202: change check on inventory from post to pre unmarshal, add a check about MACHINEID existence
Merge pull request #11 from fanf/bug_3202/dev/if_machineid_tag_is_missing_dummy_one_is_used

Fixes #3202: change check on inventory from post to pre unmarshal, add a check about MACHINEID existence
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Fixes #3202: change check on inventory from post to pre unmarshal, add a check about MACHINEID existence
Merge branch 'branches/rudder/2.5'