Nick Briggs

Does this fix regress any of these earlier fixes? CDAP-16474 ([Jira](https://cdap.atlassian.net/browse/CDAP-16474)|[Commit](https://github.com/cdapio/cdap-ui/commit/b7b42d4bcd7a7ad1bc15ce9f14ecfa2cbdd914ae)) CDAP-17295 ([Jira](https://cdap.atlassian.net/browse/CDAP-17295)|[Commit](https://github.com/cdapio/cdap-ui/commit/558ceac9348a49fbcbe1cf6c5e0958cb58b0951a))

@antony-britto Can you try out the cases mentioned in the bugs above and make sure they're still fixed?

Can you add a Jira for this?

This is very large PR that seems to do multiple things. Can you split it up?

Code changes LGTM, but this is failing the Cucumber tests: ``` java.lang.NoSuchMethodError: com.google.common.collect.ImmutableMap.of(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMap;