Updated versions mapping to be more ES-like (bug 892618)

This is like the earlier commit that later got reverted but adds a safeguard in `es_app_to_dict` so it doesn't blow up before the reindexing happens.