Update master version to 2.1.99

This clearly represents that we are ahead of the current eos2 branch,
and will satisfy the minimum OS requirements for app bundles
that are targeting the current eos2 branch.
Merge branch 'master' into eos2

Conflicts:
	configure.ac