Merge in NMAAS/nmaas-portal from release/1.5.0 to develop * commit 'c367b5a4': Update core files for version 1.5.0