a89f8c5249
So this reshuffles the metadata to make an master-upstream and master-downstream so that we don't get them confused with the respective latest versions or each other. Also updated for the next couple of releases in the name of not having to make more pointless commits. Change-Id: I7cbd78b5c5441aadbda0b17c8db2b3312ad93df7