Update branding to 2.1.6-servicing (#1455)

Cleanup the implementation of version.props to make it clearer what the rules are for appending version suffixes, applying updates, etc.