Fixed bug in handling response of GetContentByIdRequest that was introduced after ContentResource.get was changed to only return one content
CMS-2089 Let ContentResource get, list and find methods support expand option
Minor refactoring
 - Do not ignore nulls (ContentIdJson)
 - Used more final