Pull Multi-Bug fixes from flux/dev for further testing

More testing of intraday from fluxtream development