Merge commit '623fce3c' into uritemplate 3.0.0. Initial commitcd of uritemplate 3.0.0. am: 43c5a5f3 am: eaee3099 am: 87f7b244 Change-Id: I7ba2da86e9ad760f6239e671b32e662111cea545