FALCON-127 Fix test issues after FALCON-107. Contributed by Shwetha GS
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-falcon into develop