Merge "Fix for NullPointerException in ecomp-portal-BE-common"