MULE-7140 - adding minor changes do to pull request comments