Merge in NMAAS/nmaas-portal from release/1.5.1 to develop * commit '17b6e5c5': Updated version to 1.5.1