Merging July branch, resolved conflicts#3503

Merged

dsgouda merged 5 commits intoAzure:masterfrom MikhailTryakhov:merge-july-branch

Jul 25, 2018

+38,419-865

Commits on Jul 2, 2018

Added api version 2018-06-01 folder (Azure#3342 )

MikhailTryakhov
authored and
dsgouda
committed

Commits on Jul 5, 2018

Refactored parameters definition (Azure#3346 )

EvgenyAgafonchikov
authored and
dsgouda
committed

Commits on Jul 11, 2018

Port fixes from 04-01 to 06-01 (Azure#3366 )

EvgenyAgafonchikov
authored and
sergey-shandar
committed

Commits on Jul 25, 2018