MediaContent API cleanup and alignment

http://jira.webinos.org/browse/API-34
http://jira.webinos.org/browse/API-38

see commit messages for more details.