Fixes #3157 : Add Android OS Type support
Fixes #3088: typo in modification error message, s/reasons/reason/
Refs #3160: correct reporting with  quote in component key value
Merge pull request #67 from ncharles/bug_3160/dev/validate_use_of_quote_in_component_key

Refs #3160: correct reporting with  quote in component key value
Merge pull request #65 from VinceMacBuche/ust_3155/dev_3157/Android_backport

Fixes #3155 : Add Android OS Type display
Merge pull request #66 from fanf/bug_3088/dev/typo_in_modification_message_error_on_reason

Fixes #3088: typo in modification error message, s/reasons/reason/
Merging modifications of refs #3160 into 2.4
Fixes  #3163: change pom version
Merging 2.4 to 2.5
Refs #3166: correct the artefact version on branch master