Api 36 upgrade #35

Job	Run time
CI / Validate Code / Validate Code	1m 1s
CI / Unit Test	0s
CI / Integration Test	0s
CI / Build Test App	0s
CI / Functional Test	0s
CI / Javadoc	0s
	1m 1s

Provide feedback