Merge "3.3.1 dev" into "release 3" master

SOL002/VNFConfiguration-API/environment/variables.txt

@@ -10,13 +10,14 @@ ${EM-VNF_SCHEMA}    https
 
 ${ACCEPT}         application/json
 ${AUTH_USAGE}     1
-${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+${AUTHORIZATION_HEADER}    Authorization
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 
 ${CONTENT_TYPE}    application/json
 
 ${apiRoot}        /
 ${apiName}        vnfconfig
-${apiVersion}     v1
+${apiMajorVersion}     v1
 
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX