Description of changes:
Same set of changes as the ones against the ros1 branch. Ran the commands and made sure they were able to successfully create the desired docker images for this branch also/
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Issue #, if available:
Description of changes: Same set of changes as the ones against the ros1 branch. Ran the commands and made sure they were able to successfully create the desired docker images for this branch also/
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.