Merge branch 'master' into 'master'

Fix image name for nscharm user and policy vnfs

See merge request !117