Merge metadata edition from 2.1.x branch to the trunk
The branch in 2.1.x of the metadata portlet will contain a new controller and new configuration enabling to edit some metadata. It will be needed to (1) cleanup the code the 2.1.x that probably contains some fields that do not exists on default OW2 bundle and (2) merge the changes.