Merge pull request #2804 from tano-systems/pr/bootstrap-dashboard-fix