Merge pull request #378 from mulesoft/MULE-7292

MULE-7292 - failing deploy of applications that cannot bind to an http p...
(cherry picked from commit 321c318ae2548ef6e8f5150cd777724fddc1b95f)
Merge pull request #382 from mulesoft/MULE-7292

MULE-7292 - fixing broken test case
(cherry picked from commit 34af6798f9afc20603dded357355ac14ad533cf6)