[INTERNAL] sap.ui.model.odata.ODataModel: clean-up

PS1: cleanup
PS2: rebased; liftSAPData() also if there are no v4 annotations
PS3: update ODataMetaModel.json; be robust in case of no v2 extensions
PS4: fix JsDoc
PS5: line too long

Change-Id: I6321245a34013c5b161a1dd2fbf4728adc71dc8d
JIRA: FLPUISERVICES2014-1084
Merge "[INTERNAL] sap.ui.model.odata.ODataModel: clean-up"