(cherry picked from commit 32e490b6c035487e99df30ce80366446fe09bd6c)
(cherry picked from commit c31e3ba92132f232bd56b257f3854ffe430fbab9)
(cherry picked from commit 07d31d4c0808a169f4770187d655f38aa105255c)
(cherry picked from commit b0ad644083a0dfae3a39159ac88b6fc09d846371)
(cherry picked from commit 802676e1be350785d8c0ad35f6676eeb85b2467b)
(cherry picked from commit 2cadeb9e017c6a75db16e1f23b2accda04f12298)
(cherry picked from commit f47a5763acd55cb0b3f16152c7f8df06ec0e09a9)
(cherry picked from commit 3316cd4357ff6ccc4c76584813092adb1c2b4d43)
(cherry picked from commit 24d45ee9544abcfcf9e611ab835ec2f824333670)
(cherry picked from commit f65eeb412d140a3808bcf99344a9f3a965918f70)
(cherry picked from commit e7cbecddc3e7ca5386c71aa4deb67f133611415c)
(cherry picked from commit 9d47d5aa5bffe427c4a77260f7ccc039d446e1fd)
(cherry picked from commit 9c5911294e0ba71aefe4763731b0e780cde9d0ca)
(cherry picked from commit 1ff3fd33ed6f2ac09c774cc42b0107c5dbd9c19d)
(cherry picked from commit 82c722aae86669325672dd10840447434f15e7fd)
(cherry picked from commit 6bc7710ec7f2592c4c87dd940fbe5827ef81fe72)
(cherry picked from commit 8e142d27cbddfa1a1c83c5f8752bd14ac0a13612)
(cherry picked from commit 4d43be3c01b1bc0deb31a9081fca5395d0eb4e0d)
(cherry picked from commit 95bfd087dc89e57a93340604cc8b96042fa1a05a)
(cherry picked from commit a5f3fb4dc14503bf7c454a48cf954fb0d6710de2)
(cherry picked from commit 27a2f0acb84202cc082090eef7eea57f6e42f9bb)
(cherry picked from commit 1b672096121fef775572b517d4f5721997abbac6)
(cherry picked from commit 6660c2f83b855535217582326746dc76d53fdf61)
(cherry picked from commit 6ea859e435e7cd6bc342f67e1551ccb86fbd976f)
(cherry picked from commit ce5bf927c3d9f212798de1bf8706e5e9def235a1)
(cherry picked from commit a1963968d2a9589fcefaab0d63feeb68c07f4d06)
(cherry picked from commit 591e261ccf1fb5dd25e87665c8d5c0341ff6fb24)
(cherry picked from commit 8d88691d162f87f95c9ed7e0a569ef08e8385d4f)
(cherry picked from commit 0d62e948877e5d50f1b6fbe735a94ac6da5ff472)
(cherry picked from commit 4a5b0e708d42fbff571229a43d1762d1767e2db5)
(cherry picked from commit 22426a1c9f4bd616558089b6862fd34ab42d19a7)
(cherry picked from commit 721d7b574126c4070322f70ec5b49a7b8558a4c7)
(cherry picked from commit 5dfa25f22a989222e8b3d1013117b3350a48b2c5)
(cherry picked from commit b2f1ec312ee431aef762cfb49cb29cd6f4661e86)
(cherry picked from commit 888a44563819ba910dc3cc10d10ee0fb8f05db61)
(cherry picked from commit b78f87825bd593e30b2f2ea76f37c7a4fd673ab2)
(cherry picked from commit d5855c0e46404cfc1b5a63e59015e68ba668f0ea)
(cherry picked from commit fd75b8c9cadd069673afc80a0fc5661d779897bd)
(cherry picked from commit a62891971380e5f8e4a645ed36bd88aa6fe0e47a)
(cherry picked from commit 0af6a99a3fcfa4b47d3bcba5e5cc5fe7b312a152)
(cherry picked from commit 61466809552f96a83aa19446d4d59cecd0d2cad5)
(cherry picked from commit ab654746fbad2da12b24b13425dc9bf17c46b50c)
(cherry picked from commit ddc5be48fc35868abf7f59088f747c636e76a42a)
(cherry picked from commit c116743bdda2b1792bf872020a5e2b14d772ac60)
(cherry picked from commit 3c9d26ae14625de3e9437c07eceda0d05f1985b2)
(cherry picked from commit 1454efe5d4fe4214ec5ef9142d55dbeca7dab953)
(cherry picked from commit ca0349b87ab1b2d0d2b9dc93de7806d26713165c)
(cherry picked from commit 2f6be218fa41fd0f39633ec5ed0df6e0fa0f54b6)
(cherry picked from commit 0d89859b51157078cc504ac81dc8aa75ce6b1782)
(cherry picked from commit 8b398a66ca3728f47363fc8b2fcf7e556e6bbf5a)
(cherry picked from commit 37f1789f419fa741c2fbae9855549d405e856bff)
(cherry picked from commit 0402bada1989258ecbfdc437cb339322a1f55a97)
(cherry picked from commit 173664d70f0ed3b1852b6703d32e796778fb1c78)
(cherry picked from commit 04e71db1ce9572ae0641234a02b7db5d174668fd)
(cherry picked from commit a2e07a54561a57a83b943628ebbc53ed5ba52718)
(cherry picked from commit 1986ea8dd223267ced3e3aef69980b46e2fef740)
(cherry picked from commit 2b827a18d7b4eb41dc0095ea7277239273e7e396)
(cherry picked from commit 799353e2c7db5af6e40e3521439b5c8a3c5c6a51)
(cherry picked from commit 25be97808b99148412c0efd4d87fc750db4d6607)
(cherry picked from commit d82bf536d44c6e7ba06a01105545b3979b731d80)
(cherry picked from commit 392c3aaea8e8f156b76e418157fa347256283c56)
(cherry picked from commit d6f3d4893d750f19dd8c539fe28eecfab2a54576)
(cherry picked from commit 61efbc1cba0c4a81b8aafb1d45c2f7b3cf7857d8)
(cherry picked from commit 8a7ca13b13c0c3f008a6490cc96d4d48a051d1f7)
(cherry picked from commit ae35b0e14d3438237f4b5d3b5d5268d45e549846)
(cherry picked from commit 65acee3e19a147e5c5a8688319ab75357bdf51b5)
(cherry picked from commit 9cb8b75ba57f18639492bfa3b7e7c11c00bb3d3b)
(cherry picked from commit db31ef7e7f55436bbf88c6d93e2273c4463ca9f0)
(cherry picked from commit e669974ae94c03914c9181a4481b4879fd4acc0d)
(cherry picked from commit 81c9d17af84ed87b9ded7057cb726a3855ddd32d)
(cherry picked from commit 242fd0e39ad1c5d51719cd0f6c197166066e3288)
(cherry picked from commit a9d5acd898b34e1050a78f2d70ed62fdb82948a6)
(cherry picked from commit d005404ef7211fe96ce1801ed267a249568540fd)
(cherry picked from commit beb184ac580b0d89351a3f3a7201da34a26db1c1)
(cherry picked from commit 325bb33988743d60cb333002f9da60314241632e)
Fixed a minor import issue in the test during cherry-pick from trunk.
(cherry picked from commit e76faebc9589654e83c8244ef9aff88391e56b80)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
