Merge branch '2.7' into fix-aws-sts-handle-errors

include/assume_role

@@ -11,9 +11,9 @@
 # CONDITIONS OF ANY KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations under the License.
 
-# both variables are mandatory to be set together
 assume_role(){
-    if [[ -z $ROLE_TO_ASSUME ]]; then
+    # Both variables are mandatory to be set togethe
+    if [[ -z $ROLE_TO_ASSUME || -z $ACCOUNT_TO_ASSUME ]]; then
         echo "$OPTRED ERROR!$OPTNORMAL - Both Account ID (-A) and IAM Role to assume (-R) must be set"
         exit 1
     fi