Merge branches 'develop' and 'feature-autobuild/cleanup' of https://git-wip-us.apache.org/repos/asf/flex-falcon into feature-autobuild/cleanup