Fixed upgrading from 1.14 images.
Merge pull request #1527 from obino/fix-upgrade-with-bootstrap

Fixed upgrading from 1.14 images.
Merge remote-tracking branch: upstream/master