Fix promises

@nandy-andy @rogatty This should bring back the promise with one exception of an error in loadMapData chain.

When we merge it to release-15 a pull request from release-15 to dev will be automagically updated and then we'll be able to release a new version.