Merge branch 'master' into v7.0

* 09bb6134 fix 1006 command wim-show tries to load json twice
* 3a463547 osm.py: --long option for ns-op-list
* 0a2a4d45 osm.py: improved help message for some commands
* b94720f0 ns-list --details: renamed to --long; added instantiation date, added project and vim id

Change-Id: I677134e39606332a5df4f6f64103b619643bb45c
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>